Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 27 Jan 2012 19:04:55 +0000 (13:04 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 27 Jan 2012 19:04:55 +0000 (13:04 -0600)
commit00b0b7fe5236ae84f227903065d541068a7f9ae5
tree8a2c2dd60efa7e6d09b66b8929d3a7aec29c86af
parent4dade240be9093dbf60ee91cc9e09152ae7efbee
parent06f956a2b2268263c793ed8fd1b0e412b3078c4a
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev