Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 24 Nov 2011 15:27:41 +0000 (10:27 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 24 Nov 2011 15:27:41 +0000 (10:27 -0500)

Trivial merge