Merge branch 'recrutement' of git.auf:auf_rh_dae into recrutement
authorAli Jetha <ali.jetha@auf.org>
Tue, 28 Jun 2011 20:35:24 +0000 (16:35 -0400)
committerAli Jetha <ali.jetha@auf.org>
Tue, 28 Jun 2011 20:35:24 +0000 (16:35 -0400)
1  2 
project/settings.py

Simple merge