Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Fri, 29 Oct 2010 19:24:11 +0000 (15:24 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Fri, 29 Oct 2010 19:24:11 +0000 (15:24 -0400)

Trivial merge