Merge branch 'master' of git@github.com:ericflo/django-pagination
authorfloguy <floguy@7f1efe38-554e-0410-b69d-834cb44da2d5>
Mon, 30 Mar 2009 03:37:27 +0000 (03:37 +0000)
committerfloguy <floguy@7f1efe38-554e-0410-b69d-834cb44da2d5>
Mon, 30 Mar 2009 03:37:27 +0000 (03:37 +0000)
git-svn-id: https://django-pagination.googlecode.com/svn/trunk@47 7f1efe38-554e-0410-b69d-834cb44da2d5


Trivial merge