Merge branch 'master' of git://github.com/martinsvoboda/django-pagination
authorZygmunt Krynicki <zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 13:24:41 +0000 (15:24 +0200)
committerZygmunt Bazyli Krynicki <Zygmunt Krynicki zygmunt.krynicki@linaro.org>
Mon, 13 Jun 2011 13:24:41 +0000 (15:24 +0200)
commit340445da5b59b97926d2d95496f63fb34bed7de2
tree2b76dcd38f14f83239cf8cc635c7ce6b82497b60
parent143915685cba95f9968f0bb8e67ab499995e141f
parentb134d88b52a7bcf402a576294492fba00712861f
Merge branch 'master' of git://github.com/martinsvoboda/django-pagination

Conflicts:
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/tests.py
tests/runtests.py
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/tests.py
tests/runtests.py