Merge branch 'master' of git://github.com/hgrimelid/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 11:56:31 +0000 (13:56 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 11:56:31 +0000 (13:56 +0200)
commit8bdbfba8a3c27400c1535b761de439cf87884481
tree600d2dc735565a26378dad508914e397bfc81a76
parent5cbe6d1e24e434332fd8872e8fb5d2a1c830a052
parent574b2a608a032b8771bc0eba65afb78dd05ccd7b
Merge branch 'master' of git://github.com/hgrimelid/django-pagination

Conflicts:
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/locale/nn/LC_MESSAGES/django.po
linaro_django_pagination/locale/no/LC_MESSAGES/django.po
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py