Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Fri, 15 Oct 2010 15:58:18 +0000 (11:58 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 15 Oct 2010 15:58:18 +0000 (11:58 -0400)

Trivial merge