From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 21:51:23 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.5-1~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6534b9593a9aff2d6f5e18de8d87371165d920b4;p=telemeta.git

Merge branch 'master' into dev

Conflicts:
	example/sandbox/settings.py
	setup.py
---

6534b9593a9aff2d6f5e18de8d87371165d920b4
diff --cc example/sandbox/settings.py
index 38a8743a,6ea20621..5b07bf24
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@@ -130,8 -129,8 +130,9 @@@ INSTALLED_APPS = 
      'jsonrpc',
      'south',
      'sorl.thumbnail',
-     'notes',
+     'timezones',
+     'jqchat',
 +    'debug_toolbar',
  )
  
  TEMPLATE_CONTEXT_PROCESSORS = (