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)
commit55c85588c0d1a0243a5e82902d9377d91e08c849
tree5a05bb3db5da63722c31e1187be56f6178086bff
parentabaa369ff3cd87a4a113c7373b423fd0926655d0
parente6d2f2f30b02531039ef56f4baa2b96e99860a6e
Merge branch 'master' into test

Conflicts:
auf_savoirs_en_partage/settings.py
auf_savoirs_en_partage/settings.py