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)
commitaa3c7b049fe1b33df76c18f9a73894650f23e5aa
treef8f0272385575a3d5381720ad5b3d11a2c8c1d6b
parent4da44a86be020fc9c1f897c5bfb49d716aeea483
parent721d9f37c84f1d8ae2785736a405fc031226a275
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django