Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 2 Feb 2012 22:38:28 +0000 (17:38 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 2 Feb 2012 22:38:28 +0000 (17:38 -0500)
commit3e0d2a4cbf532bce3ea6a245e2a0be99d4a182d8
treea76adc518e17c2e94a34287dcd71eb07f7dc57c0
parent693c606b482de8949655b2d7167018c50305402c
parent2ce4b573657d86bcb0483171c032d0ebbf85b5eb
Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev
auf_savoirs_en_partage/chercheurs/models.py
auf_savoirs_en_partage/chercheurs/views.py
auf_savoirs_en_partage/savoirs/models.py