Merged with master

AUTHORS.rst

@@ -18,3 +18,4 @@ Florent Messa / thoas <https://github.com/thoas>
 Markus Kaiserswerth / mkai <https://github.com/mkai>
 Michael Lindemuth / mlindemu <https://github.com/mlindemu>
 John Furr / gnulnx <https://github.com/gnulnx>
+Christian Pedersen / chripede <https://github.com/chripede>

redis_cache/__init__.py

 from redis_cache.backends.single import RedisCache
 from redis_cache.backends.multiple import ShardedRedisCache
+from redis_cache.backends.dummy import RedisDummyCache

redis_cache/backends/dummy.py

+from django.core.cache.backends.dummy import DummyCache
+
+
+class RedisDummyCache(DummyCache):
+    def ttl(self, key):
+        return 0
+
+    def delete_pattern(self, pattern, version=None):
+        return None
+
+    def get_or_set(self, key, func, timeout=None):
+        if not callable(func):
+            raise Exception("Must pass in a callable")
+
+        return func()
+
+    def reinsert_keys(self):
+        return None
+
+    def persist(self, key):
+        return True
+
+    def expire(self, key, timeout):
+        return True

setup.py

@@ -5,7 +5,7 @@ setup(
     url="http://github.com/sebleier/django-redis-cache/",
     author="Sean Bleier",
     author_email="sebleier@gmail.com",
-    version="1.5.5",
+    version="1.6.0",
     packages=["redis_cache", "redis_cache.backends"],
     description="Redis Cache Backend for Django",
     install_requires=['redis>=2.10.3'],