Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Fri, 17 Sep 2010 20:30:08 +0000 (16:30 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Fri, 17 Sep 2010 20:30:08 +0000 (16:30 -0400)
commitafc38ad93a9bf4dea53f9feb845bf4e7b6835b23
tree184cd1f42f6dc004ae949291b45cec1241e96d54
parent575204fb19a018ef3c98d2903c8419e4a553b209
parent221f4f6cebe35f26806ef391b488a41086b5882a
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django