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=inline;hp=-c

Merge remote branch 'carljm/hashtag'

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

947647e585b7621a41b8a5d1e72f9d6924cf6750
diff --combined pagination/templatetags/pagination_tags.py
index fa8fd48,bb9978d..ae843b1
--- a/pagination/templatetags/pagination_tags.py
+++ b/pagination/templatetags/pagination_tags.py
@@@ -104,7 -104,7 +104,8 @@@ class AutoPaginateNode(template.Node)
          context['page_obj'] = page_obj
          return u''
  
- def paginate(context, window=DEFAULT_WINDOW, hashtag=None):
++
+ def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
      """
      Renders the ``pagination/pagination.html`` template, resulting in a
      Digg-like display of the available pages, given the current page.  If there