Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authorolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 17 Sep 2010 16:10:36 +0000 (12:10 -0400)
committerolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 17 Sep 2010 16:10:36 +0000 (12:10 -0400)

Trivial merge