Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authorolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Wed, 22 Sep 2010 15:46:19 +0000 (11:46 -0400)
committerolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Wed, 22 Sep 2010 15:46:19 +0000 (11:46 -0400)

Trivial merge