Merge branch 'hotfix' into regionalisation
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 26 Jul 2012 18:50:04 +0000 (14:50 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 26 Jul 2012 18:50:04 +0000 (14:50 -0400)
commit7e9a66792ad3d0d04f3575f8fc15f381a6e472d8
treebf27deb37008c936754b8bdee4a6485d5a806022
parent2d638b98fcd6ea84d450f91225ae257fa62815c5
parent83a22aff19f243e8aad0a3c88da7517dc6911524
Merge branch 'hotfix' into regionalisation