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)
commit993daaba73aa6511449f2c2ccfa869692afa10d5
treec4bc7c85ad9e2b507232250ed7680a31973839dd
parent99f84ffa7a2149dd45728cea5b0b867e589aa671
parent5619f8ca2aa666af41c43988467e6e83d11e345e
Merge branch 'master' of git://github.com/leah/django-pagination

Conflicts:
pagination/tests.py
linaro_django_pagination/__init__.py
linaro_django_pagination/paginator.py
linaro_django_pagination/templatetags/pagination_tags.py