Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Fri, 29 Oct 2010 20:40:26 +0000 (16:40 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Fri, 29 Oct 2010 20:40:26 +0000 (16:40 -0400)
commitd8b7723bf13bdc59a0450af5b034d322be111d4d
tree8e6b3af6a60dde9776b835126f3cbc309ccabd4b
parent6bd49ff1686a6adfac5e2789554edbecb63dbae3
parent261bbe7db7f1e375738f0835ec7c6ea15a9162aa
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django