Merge remote branch 'carljm/hashtag'

Conflicts:
	pagination/templatetags/pagination_tags.py

diff --git a/.gitignore b/.gitignore
index 0d20b64..d7c2b72 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.pyc
+dist
+*.egg-info

diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py
index bb9978d..ae843b1 100644 (file)
--- a/pagination/templatetags/pagination_tags.py
+++ b/pagination/templatetags/pagination_tags.py
@@ -104,6 +104,7 @@ class AutoPaginateNode(template.Node):
         context['page_obj'] = page_obj
         return u''
 
+
 def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
     """
     Renders the ``pagination/pagination.html`` template, resulting in a

diff --git a/setup.py b/setup.py
index f189d16..a09dcfc 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '1.0.5.1'
+version = '1.0.6'
 
 LONG_DESCRIPTION = """
 How to use django-pagination