Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Fri, 29 Oct 2010 19:24:11 +0000 (15:24 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Fri, 29 Oct 2010 19:24:11 +0000 (15:24 -0400)
commitbf39cd8a2e9115c6a895976c004aa7eff3b69a21
tree4caa16469d1d668f29cb66fc378085e07f7f7c16
parent31197fc2c263d04215d2d7575f33e9933b2d2087
parentf8b94d6b9ef4ab9fc98301d9817156f3cf996cc1
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django