Merge remote branch 'carljm/hashtag'

Conflicts:
	pagination/templatetags/pagination_tags.py

diff --cc pagination/templatetags/pagination_tags.py
index fa8fd4893197916700a1db9f31805de50a7eaf83,bb9978dd848328eb6d026d89c5b216d17cbf6491..ae843b11331c9eb8a104d1a66b683622c3e934b8
--- 1/pagination/templatetags/pagination_tags.py
--- 2/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