Merge branch 'nilovna' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 16 Apr 2012 18:25:22 +0000 (14:25 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 16 Apr 2012 18:25:22 +0000 (14:25 -0400)
commit15cdc70a3733b7283b07898c1b6ecfc9c346e478
treeb72277bc39e7e3fcdfb5294a022847e1ee1ec06d
parent1fbe6d4c2c5e8a22b609e4266ddef46d4645380e
parentc4d0af3e8c9631d31c105191fa6a4cd91534b3d0
Merge branch 'nilovna' into dev