Merge branch 'master' of git://github.com/leah/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:41:40 +0000 (14:41 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:41:40 +0000 (14:41 +0200)
Conflicts:
pagination/tests.py


No differences found