From: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
Date: Mon, 13 Jun 2011 13:24:41 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/martinsvoboda/django-pagination
X-Git-Tag: release-2.0~23
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/340445da5b59b97926d2d95496f63fb34bed7de2?ds=sidebyside;hp=340445da5b59b97926d2d95496f63fb34bed7de2

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

Conflicts:
	linaro_django_pagination/templatetags/pagination_tags.py
	linaro_django_pagination/tests.py
	tests/runtests.py
---