From: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
Date: Tue, 14 Jun 2011 09:21:36 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/callowayproject/django-pagination
X-Git-Tag: release-2.0~9
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/bfae3c1f7faa2fb712f34de01f865eb45081ca62?hp=bfae3c1f7faa2fb712f34de01f865eb45081ca62

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

Conflicts:
	pagination/templatetags/pagination_tags.py
	setup.py
---