Merge branch 'master' of git://github.com/cicuz/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:30:21 +0000 (14:30 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 12:30:21 +0000 (14:30 +0200)
commit99f84ffa7a2149dd45728cea5b0b867e589aa671
tree83bd034a8901153f9f0c69d91286475a0e80641a
parentc6d9f1ade306811fbda6016aa902749caced9b7c
parentb10406063c839f4ad856a1130c66706f004fa358
Merge branch 'master' of git://github.com/cicuz/django-pagination

Conflicts:
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py
.gitignore
docs/usage.txt
linaro_django_pagination/locale/it/LC_MESSAGES/django.po
linaro_django_pagination/templates/pagination/default.html
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/tests.py