Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 24 Nov 2011 15:27:41 +0000 (10:27 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 24 Nov 2011 15:27:41 +0000 (10:27 -0500)
commitbd6655d61b6128a7bbb9fd6e4e2490a4c6ac019e
treec19fbffee8e68d7b00a4091028229e0d0105b313
parent551ef0955d144943fd372da81019585b51a90f6e
parentfe4788a1e1ed96d13c852b4bedddafedad6552e7
Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev