fnp / django-pagination.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 340445d)
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)
Conflicts:
linaro_django_pagination/templatetags/pagination_tags.py
linaro_django_pagination/tests.py
tests/runtests.py


No differences found