Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Sat, 16 Oct 2010 18:51:45 +0000 (14:51 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Sat, 16 Oct 2010 18:51:45 +0000 (14:51 -0400)

Trivial merge