Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 15 Dec 2010 16:44:14 +0000 (11:44 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 15 Dec 2010 16:44:14 +0000 (11:44 -0500)
commit9e042fa89aab42254671adfccfc04fe6be6c076b
treebb17ed674cd573e6b618c258d284d3aabeb461b6
parent9553bf2dc0107efa740fdbf88ca134f86c53fb13
parentec81ec662f5d3aa7d7b31a370779d97413cd108d
Merge branch 'dev' into test
auf_savoirs_en_partage/chercheurs/forms.py
auf_savoirs_en_partage/chercheurs/views.py
auf_savoirs_en_partage/savoirs/models.py