Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Mar 2011 19:39:11 +0000 (14:39 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Mar 2011 19:39:11 +0000 (14:39 -0500)
commit842c0f00615ac87a928ef5e0aea63873b4f966bd
treea806064cad6bdaf439dd3c2ee2fce96305dc9186
parent1760a3e95c9648262fad2a47fa9d3c2d1faed3ef
parentfdcf58742d35c4f534aac693e0a5c643a362df76
Merge branch 'dev' into test
auf_savoirs_en_partage/chercheurs/models.py