Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 8 Feb 2012 21:28:34 +0000 (16:28 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 8 Feb 2012 21:28:34 +0000 (16:28 -0500)
commit2a3d036f871674958ca9c422121f96af271ee0af
tree9c93dadacb041768b1c9b45422716e7cf1bfe244
parente4cec79e4bbfa7e2a56ef5729aa2bfd4568c7509
parentaad18f65b0a5f449407c8a285f7e3bddc6f0c4f7
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev