Merge branch 'master' of git://github.com/callowayproject/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Tue, 14 Jun 2011 09:21:36 +0000 (11:21 +0200)
committerZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Tue, 14 Jun 2011 09:21:36 +0000 (11:21 +0200)
Conflicts:
pagination/templatetags/pagination_tags.py
setup.py


No differences found