From: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
Date: Mon, 13 Jun 2011 12:12:31 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/spanasik/django-pagination
X-Git-Tag: release-2.0~33
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/c6d9f1ade306811fbda6016aa902749caced9b7c?hp=c6d9f1ade306811fbda6016aa902749caced9b7c

Merge branch 'master' of git://github.com/spanasik/django-pagination

Conflicts:
	linaro_django_pagination/templates/pagination/pagination.html
	linaro_django_pagination/templatetags/pagination_tags.py
---