Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 1 Sep 2011 18:53:37 +0000 (14:53 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 1 Sep 2011 18:53:37 +0000 (14:53 -0400)
commitb8b3f213d649ccd93e4bc57525c40e9d626443e5
treecb2280072f1115bdebd50f25cb27d47e8b98a6f9
parent6b22e8c34901461c79c5857c98f7144e18813b4d
parent14dc44f383f30b4df929915a8be827350f497902
Merge branch 'dev' into test