Merge branch 'olivier' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 21:05:59 +0000 (17:05 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 21:05:59 +0000 (17:05 -0400)
commit96c0e7894e4147a447c6df0c674e6d5127e73aa8
tree25033d5a66c91699900931a82624dcb940868d5c
parent27bc8691e35b4f94585029dd7bec3f38658a440e
parentbc17b82cc86941b7e9dce4a1c53451f86e05171d
Merge branch 'olivier' into dev