Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 12 Oct 2011 17:33:43 +0000 (13:33 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 12 Oct 2011 17:33:43 +0000 (13:33 -0400)
Conflicts:
auf_savoirs_en_partage/settings.py

1  2 
auf_savoirs_en_partage/settings.py

Simple merge