Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Thu, 7 Oct 2010 20:30:47 +0000 (16:30 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Thu, 7 Oct 2010 20:30:47 +0000 (16:30 -0400)
commitb79f627fa600a1e5e5d042f444c12138c50a9695
treea2b7468d813215cd28ebfbb0a96b8123f369a1f8
parent7f7de67aa48f3d69dcb4337fe29e0f1c4463a422
parent1dd28678ebb7b31d9cb5e5d2002418f8f0aa3d9a
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django