Merge branch 'master' into test test
authorDavin Baragiotta <davin.baragiotta@auf.org>
Fri, 9 Aug 2013 19:50:54 +0000 (15:50 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 9 Aug 2013 19:50:54 +0000 (15:50 -0400)
1  2 
auf_savoirs_en_partage/settings.py

Simple merge