Merge branch 'master' of ssh://git.auf/auf_savoirs_en_partage_django
authorEric Mc Sween <eric.mcsween@savoirfairelinux.com>
Wed, 12 Jan 2011 19:33:36 +0000 (14:33 -0500)
committerEric Mc Sween <eric.mcsween@savoirfairelinux.com>
Wed, 12 Jan 2011 19:33:36 +0000 (14:33 -0500)

Trivial merge