Merge branch 'olivier' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 20:06:48 +0000 (16:06 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 29 Mar 2012 20:06:48 +0000 (16:06 -0400)
commite9499b15b5b9c1184befc349f67ffdca55b1777f
tree9331ed84085269f4991be0ea3b2aec708e97bc42
parentc75071784ada186918b56e6caa1e3c94332bbb8e
parent88202dc34adc72a6404f3aa15fa95a5565c13278
Merge branch 'olivier' into dev