From: Olivier Larchevêque <olivier.larcheveque@auf.org>
Date: Thu, 22 Mar 2012 20:12:04 +0000 (-0400)
Subject: Merge branch 'hotfix' into olivier
X-Git-Tag: 1.6.5~160^2~28
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=c360303cfb36479ab12a03b4fea9aa3cad09a9ee

Merge branch 'hotfix' into olivier
---

c360303cfb36479ab12a03b4fea9aa3cad09a9ee