Merge branch 'master' of ssh://git.auf/auf_savoirs_en_partage_django
authorEric Mc Sween <eric.mcsween@gmail.com>
Fri, 29 Oct 2010 15:26:25 +0000 (11:26 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Fri, 29 Oct 2010 15:26:25 +0000 (11:26 -0400)

Trivial merge