Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 3 Feb 2012 00:02:55 +0000 (18:02 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 3 Feb 2012 00:02:55 +0000 (18:02 -0600)
commit9f9b996265ff658d85eabb312638a59a4d1c3784
treeb22796c823a3e29734afa4ade52c4f19707f844c
parentabf919058a77cb423400789e9a02f5e8040fd20e
parent95b630cf61e7ce16eb0fcc1f06ed127abbb375ca
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev