Merge branch 'master' into dev

author Guillaume Pellerin <yomguy@parisson.com>

Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)

committer Guillaume Pellerin <yomguy@parisson.com>

Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
author Guillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
committer Guillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
diff --cc example/sandbox/settings.py

index 38a8743ac72e11b3ffa6f01bd9f7e8553a149189,6ea2062177c1dba2960b400ce4cd6bca8255ce03..5b07bf24cbe8fd67ee9706b0b79391f6cbb6d560
--- 1/example/sandbox/settings.py
--- 2/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 = (
diff --cc setup.py
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
		1	2
example/sandbox/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history