Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Thu, 7 Oct 2010 22:04:30 +0000 (18:04 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Thu, 7 Oct 2010 22:04:30 +0000 (18:04 -0400)
commit7c893d65430cf9970d9a640a77081761c981e83d
tree8ffc761a47a87a310783e9c173b595444b2f475a
parent2e7bc8596466abcb7002c73d36ab46246f3c0068
parent99a6bf1a7348c8fdc1381db4e7b3dae0d277c680
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django