From 90594960cb01762c115b82ab9ca6f90eaa6a9f04 Mon Sep 17 00:00:00 2001
From: Michael Heumann <m.heumann@isn.eu.com>
Date: Sat, 25 Apr 2015 19:07:44 +0200
Subject: [PATCH] updates changelog, version bump

---
 ChangeLog                                 | 6 +++++-
 README                                    | 4 ++--
 wadofstuff/django/serializers/__init__.py | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31863cf..08db507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-version 1.1.3:
+Version 1.1.4:
+- Updated imports to use with Django 1.7+
+- changed namespace to avoid conflicts
+
+Version 1.1.3:
 - Updated JSON import for Django 1.5+
 
 Version 1.1.2:
diff --git a/README b/README
index c5882e9..73b1af6 100644
--- a/README
+++ b/README
@@ -15,6 +15,8 @@ The additional capabilities are:
 - relations - a list or dictionary of model related fields to be followed
   and serialized.
 
+To use it simply add it to SERIALIZATION_MODULES in your settings.py.
+
 Example of serializing a relation
 ---------------------------------
 
@@ -39,5 +41,3 @@ Example of serializing a relation
             }
         }
     ]
-
-
diff --git a/wadofstuff/django/serializers/__init__.py b/wadofstuff/django/serializers/__init__.py
index 7b344ec..bc50bee 100644
--- a/wadofstuff/django/serializers/__init__.py
+++ b/wadofstuff/django/serializers/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.2'
+__version__ = '1.1.4'