Merge branch 'master' of git://github.com/stephane/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:54:16 +0000 (14:54 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:54:16 +0000 (14:54 +0200)
commit7f5e87b3900b780fce0dcbe9e11e9c191af03571
treeee0bef1465ccf3a034bb33bc180269233bf442b4
parent5cef3f80baa913c0c2263d2d9e751546b3a72c94
parent4184df3e339213a216c3b13f296dd1a6c37d4002
Merge branch 'master' of git://github.com/stephane/django-pagination

Conflicts:
MANIFEST.in
setup.py
CONTRIBUTORS.txt
MANIFEST.in
setup.py