Merge branch 'master' of ssh://git.auf/auf_savoirs_en_partage_django
authorEric Mc Sween <eric.mcsween@gmail.com>
Thu, 28 Oct 2010 14:34:37 +0000 (10:34 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Thu, 28 Oct 2010 14:34:37 +0000 (10:34 -0400)

Trivial merge