Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 3 Feb 2012 14:46:30 +0000 (08:46 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 3 Feb 2012 14:46:30 +0000 (08:46 -0600)
commit06af7134bb948f3e0a03198f42e688b403d51367
treefb26f073bc6b48410c548191253c8400d76db564
parent9f9b996265ff658d85eabb312638a59a4d1c3784
parent5429c435ebc55912b4b3f8c9a810f47a10c33b3c
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev