Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 6 Mar 2012 21:25:14 +0000 (15:25 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 6 Mar 2012 21:25:14 +0000 (15:25 -0600)
commit1f86fd068db9678db36d56def815a9cd45b12930
treed124e4dc8d9ccea67ba5662808c036fbbc40e966
parent5c0f1778f81213b7a0e2487d8f4f6a0ab950b4c8
parent8cefa2d9d1b486e7e484725ff050889bad2d7862
Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev