Merge branch 'master' of ssh://git.auf/auf_savoirs_en_partage_django
authorEric Mc Sween <eric.mcsween@gmail.com>
Tue, 2 Nov 2010 15:16:22 +0000 (11:16 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Tue, 2 Nov 2010 15:16:22 +0000 (11:16 -0400)

Trivial merge