Merge branch 'test' of git.auf.org:auf_savoirs_en_partage_django into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Mar 2011 19:40:03 +0000 (14:40 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Mar 2011 19:40:03 +0000 (14:40 -0500)
commit74bb75c26bc329694946d1bc003cdbd6d48fbd6e
treed43145c81ae8171fb11333a27b57fc5f07f1f7b9
parent842c0f00615ac87a928ef5e0aea63873b4f966bd
parente2778b6443e9acdaba5ba2c8412c265d18d0e2c9
Merge branch 'test' of git.auf.org:auf_savoirs_en_partage_django into test