Merge branch 'master' into olivier
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 18:56:13 +0000 (14:56 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 18:56:13 +0000 (14:56 -0400)
commit77607f422a2e0162be01b9601a336562dd91d39d
treeb86afb2a80e84f8e0b3f6a487caeac6f15497b58
parentc233491c28bed8b4664de71f3c46a3c26d7b5c03
parented5ee2f9ba3fbc439c30a925963a417de2c4ce80
Merge branch 'master' into olivier
project/rh/admin.py