Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 13 May 2011 21:16:31 +0000 (17:16 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 13 May 2011 21:16:31 +0000 (17:16 -0400)
commit7bd32fb15dbd65d7abd59da05598629dce7023fa
treec2a01ea83f5a20213228f5b5ad7eba3607fb541e
parent515124ecbd9dc290b02752d871b9293184eb3b6e
parent180a4d25bf712d425f4ec4e60c2ef938e85c5b4a
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev