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

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

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