Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 12 Mar 2012 15:59:15 +0000 (10:59 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 12 Mar 2012 15:59:15 +0000 (10:59 -0500)
commit2d191e490ba084ebd1f433efdc58bc9c5b33d1eb
tree97659c0ce48623bdab1ab7e943f5f6b98fb849ce
parent8912e5a9cc24e9d16d7a024978083eeb055d6de8
parent65fefef91be893bcb214814dd6cdae60fba0c549
Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev