Merge branch 'hotfix' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 18:40:40 +0000 (14:40 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 18:40:40 +0000 (14:40 -0400)
commitc75071784ada186918b56e6caa1e3c94332bbb8e
treecdc4eb38988afa84527f03ea5730e1a48b8eeb82
parentae3d33d72c731256d9d457907f33bee0ba1b72e5
parentae5d7df306798fc082b3fb2953189f8a2bf12162
Merge branch 'hotfix' into dev
project/rh/admin.py