Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authorolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Tue, 21 Sep 2010 13:34:11 +0000 (09:34 -0400)
committerolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Tue, 21 Sep 2010 13:34:11 +0000 (09:34 -0400)

Trivial merge