Merge branch 'master' into dev
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 24 Nov 2010 16:17:36 +0000 (11:17 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 24 Nov 2010 16:17:36 +0000 (11:17 -0500)
commit860ea09ad1d20d713242e8005e10650209cf9709
tree62d9deba7e663bac70c86c2642d03752ded5a11c
parent5530469e4f4449adedcdd5189ca779a41017ae5c
parent5d04a51e08fc52ebb16dfa70483ec31d84dd0c76
Merge branch 'master' into dev
auf_savoirs_en_partage/chercheurs/models.py