Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Thu, 26 Jan 2012 17:58:41 +0000 (11:58 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Thu, 26 Jan 2012 17:58:41 +0000 (11:58 -0600)
commitde9995cc58b0f4d26176a9a8ca362f486b3bc04f
tree309b913605a82a257a89c4f67dbbba7983a7dbd1
parent35beb92c364b34385cb6ca22b474561235991707
parent6b84e7ff3f4376fea3996eb00fb5f96324dcd5bb
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev