From: Zygmunt Krynicki Date: Mon, 13 Jun 2011 11:56:31 +0000 (+0200) Subject: Merge branch 'master' of git://github.com/hgrimelid/django-pagination X-Git-Tag: release-2.0~36 X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/8bdbfba8a3c27400c1535b761de439cf87884481?hp=8bdbfba8a3c27400c1535b761de439cf87884481 Merge branch 'master' of git://github.com/hgrimelid/django-pagination Conflicts: linaro_django_pagination/templatetags/pagination_tags.py ---