From: Brian Rosner <brosner@gmail.com>
Date: Fri, 16 Apr 2010 15:31:27 +0000 (-0600)
Subject: Merge remote branch 'carljm/hashtag'
X-Git-Tag: 1.0.7.1~3
X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/947647e585b7621a41b8a5d1e72f9d6924cf6750?ds=sidebyside;hp=947647e585b7621a41b8a5d1e72f9d6924cf6750

Merge remote branch 'carljm/hashtag'

Conflicts:
	pagination/templatetags/pagination_tags.py
---