Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Wed, 27 Oct 2010 21:46:52 +0000 (17:46 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Wed, 27 Oct 2010 21:46:52 +0000 (17:46 -0400)

Trivial merge