Merge branch 'dev' into recrutement
authorAli Jetha <ali.jetha@auf.org>
Wed, 29 Jun 2011 20:12:13 +0000 (16:12 -0400)
committerAli Jetha <ali.jetha@auf.org>
Wed, 29 Jun 2011 20:12:13 +0000 (16:12 -0400)

Trivial merge