Merge branch 'olivier' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 21:06:09 +0000 (17:06 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 21:06:09 +0000 (17:06 -0400)
commit367a24692f97946c6b728ca56a0dd49e51494d08
tree25033d5a66c91699900931a82624dcb940868d5c
parent7441d731308d180b1412c38717cd8565bf4298d7
parentbc17b82cc86941b7e9dce4a1c53451f86e05171d
Merge branch 'olivier' into test