From: Michele Ciccozzi <cico@lapcico.(none)>
Date: Mon, 6 Jun 2011 13:06:45 +0000 (+0200)
Subject: Merge branch 'more_customizations'
X-Git-Tag: release-2.0~32^2
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/b10406063c839f4ad856a1130c66706f004fa358?hp=b10406063c839f4ad856a1130c66706f004fa358

Merge branch 'more_customizations'

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