Merge branch 'master' of git://github.com/callowayproject/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Tue, 14 Jun 2011 09:21:36 +0000 (11:21 +0200)
committerZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Tue, 14 Jun 2011 09:21:36 +0000 (11:21 +0200)
commitbfae3c1f7faa2fb712f34de01f865eb45081ca62
tree7c6c1fdd81971698af111a749529ca3fd70e177a
parente130542deba5ff5957caff73c22cc1cfbbf92ebb
parentef08a2061f1f41deae227e3cb5beaceb7e17dd23
Merge branch 'master' of git://github.com/callowayproject/django-pagination

Conflicts:
pagination/templatetags/pagination_tags.py
setup.py
linaro_django_pagination/templates/pagination/pagination.html
linaro_django_pagination/templatetags/pagination_tags.py
setup.py