Merge branch 'master' of git://git.auf.org/auf_savoirs_en_partage_django
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Mon, 13 Sep 2010 21:48:27 +0000 (17:48 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Mon, 13 Sep 2010 21:48:27 +0000 (17:48 -0400)

Trivial merge