Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Sat, 16 Oct 2010 18:51:45 +0000 (14:51 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Sat, 16 Oct 2010 18:51:45 +0000 (14:51 -0400)
commit6373a6e7e9275323d3afd5cea07c643fb4afe7ef
tree6ba3c22a0c6a4f83a77633b26d7b555056a853fe
parent3eb00212af409a9019cf662c3b30883dba4d517e
parentff024488c157b8d5854e303b1b8abeb05313946b
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django