Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Wed, 1 Feb 2012 14:17:03 +0000 (08:17 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Wed, 1 Feb 2012 14:17:03 +0000 (08:17 -0600)
commitb91818d9d273260a1d0d49bff9b9ee42de154ae6
tree850ee2882bb7c6ac03875131928924125b2fb7d0
parentbaf9b78c779df2e2197e0661d34c8af625330673
parentcb99c8c51833665a7e95995a2cc8211aa92340a3
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev