Merge pull request #11 from bfirsh/ship-1.1.01.1.0

Ship 1.1.0

3 files changed, 19 insertions, 2 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000..76de5de
--- /dev/null
+++ b/CHANGES.rst
@@ -0,0 +1,17 @@
+Change log
+==========
+
+1.1.0 (2014-10-31)
+------------------
+
+- Added support for Django 1.7
+- Added a Crockford base 32 encoder
+- Made base conversion significantly faster
+
+1.0.1 (2009-04-13)
+------------------
+
+Initial release.
+
+
+
diff --git a/README.rst b/README.rst
index 2f5e857..addcdea 100644
--- a/README.rst
+++ b/README.rst
@@ -13,7 +13,7 @@ Most code was originally by Simon Willison; see
 http://simonwillison.net/2009/Apr/11/revcanonical/ for details. Improved
 slightly and packaged by Jacob Kaplan-Moss.
 
-Patches welcome: http://github.com/jacobian/django-shorturls
+Patches welcome: http://github.com/bfirsh/django-shorturls
 
 Usage
 =====
diff --git a/setup.py b/setup.py
index 748de7b..52c07ce 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ def read(fname):
 
 setup(
     name = "django-shorturls",
-    version = "1.0.1",
+    version = "1.1.0",
     url = 'https://github.com/bfirsh/django-shorturls',
     license = 'BSD',
     description = "A URL shortening app for Django.",