Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authorolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 29 Oct 2010 18:55:41 +0000 (14:55 -0400)
committerolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 29 Oct 2010 18:55:41 +0000 (14:55 -0400)

Trivial merge