Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django
authorAli Jetha <ali@U-AJ.(none)>
Fri, 15 Oct 2010 18:59:02 +0000 (14:59 -0400)
committerAli Jetha <ali@U-AJ.(none)>
Fri, 15 Oct 2010 18:59:02 +0000 (14:59 -0400)
commita4629ac43dda5bf45cb63419358d50cca64c0b35
tree790c2fee9f8f82409980f17a70f2882e09ca55d5
parente8e9e4fd917e88f61b58e0eea46b8e02d641d26a
parentab11409536c111fb5e3ff61177401ec3324f3f80
Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django