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)
commita9cdcc55a7df2603456e7cd4113c65e6985a1614
treea47b70e538b5e5d691ccc781a2696e2c42ddba74
parent206989d4c9204fdd60573942863392435fbe1b4b
parenta46a9b2f1e0babef50109450b424a8684174ded1
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django