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

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

Conflicts:
	MANIFEST.in
	setup.py
---