Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Tue, 31 Jan 2012 16:03:54 +0000 (10:03 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Tue, 31 Jan 2012 16:03:54 +0000 (10:03 -0600)
commit1abdb65b6b116703b3d26744947afe128a09222a
tree34c3268b191702f27810dcfb6903cf468b9e1211
parent920f297cbd9b5a65bddd539115ebf2f12a5bec27
parent6f037929ed00b8f7fcb2aa6c208e18af78eb3616
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev