Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 10 Feb 2012 18:52:09 +0000 (12:52 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 10 Feb 2012 18:52:09 +0000 (12:52 -0600)
commitfedd554e8c5bca4d0d0928c1ccb46d813a32156f
treeffeb1ee7d02b7729bce844174440a9b008093bc3
parent332327870570bc31618a990554f613794b767af3
parent9e465fc0b9eb67b8988a02256c0ed70052e3515d
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev