From: Olivier Larchevêque <olivier.larcheveque@auf.org>
Date: Wed, 25 Apr 2012 14:27:13 +0000 (-0400)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.6.5~139^2~3
X-Git-Url: https://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=a8be9d867608cedad53326798c1bca9d643c4a49;hp=-c

Merge branch 'master' into dev
---

a8be9d867608cedad53326798c1bca9d643c4a49