Merge branch 'test' of git.auf.org:auf_savoirs_en_partage_django into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Mar 2011 19:40:03 +0000 (14:40 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Mar 2011 19:40:03 +0000 (14:40 -0500)

Trivial merge