Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Thu, 26 Jan 2012 14:56:51 +0000 (08:56 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Thu, 26 Jan 2012 14:56:51 +0000 (08:56 -0600)
commitcd9746963534c3e9437dc529641411d527780e8d
tree8f328e555d9e61c90036f8446696780fbfdc0234
parent4822a72a5db40ab283eb1b91e41493f75660652d
parent4a6a9e85adb1178d658799efd356b6a4453f78d4
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev