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

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

Conflicts:
	pagination/tests.py
---