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

Trivial merge