Merge branch 'master' of git://github.com/spanasik/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:12:31 +0000 (14:12 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:12:31 +0000 (14:12 +0200)
commitc6d9f1ade306811fbda6016aa902749caced9b7c
tree8fd1c545d7adcd20fda414967c2d617cb5b841ab
parent36fda9e844f537bd16548e18a7648c619df9545b
parent786f413a03df1e4d0485213d8c1d796d15ac114d
Merge branch 'master' of git://github.com/spanasik/django-pagination

Conflicts:
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/locale/ru/LC_MESSAGES/django.po
linaro_django_pagination/middleware.py
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/tests.py