Merge branch 'master' into dev
authorPA Parent <paparent@paparent.me>
Tue, 18 Oct 2011 14:00:36 +0000 (10:00 -0400)
committerPA Parent <paparent@paparent.me>
Tue, 18 Oct 2011 14:00:36 +0000 (10:00 -0400)
commitc5e9eacb65c413f335f27ec3ce63bd1d9d22caca
tree67e37a7df63e80aee0f9b45a6839c754f646b7ec
parent50d0d7e021224998e4fafe80af5422ee5fb6a392
parenta26d89c9550a03dab183d05782009106856f8aab
Merge branch 'master' into dev
auf_savoirs_en_partage/chercheurs/admin.py