Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Fri, 3 Sep 2010 20:53:19 +0000 (16:53 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Fri, 3 Sep 2010 20:53:19 +0000 (16:53 -0400)
commit828067cce675ad92d12c52b4ecd3f06f1cd384e7
tree45446fd4b5dbfe5a4472eb66bd90dd3be4492c7e
parent9f7c169e35b6b0945ad91676fc28afdb1a0fed81
parent31b6174a732ebc63e36a14613f550ecfc04f780b
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django