From: Olivier Larchevêque <olivier.larcheveque@auf.org>
Date: Thu, 18 Aug 2011 14:24:57 +0000 (-0400)
Subject: Merge branch 'master' into dev
X-Git-Tag: DAE+RH~255^2~1^2
X-Git-Url: https://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=54d6b36409b97465e7e3278e3e3918cb240904c7

Merge branch 'master' into dev
---

54d6b36409b97465e7e3278e3e3918cb240904c7