Merge branch 'dev' of git://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 8 Feb 2012 20:42:57 +0000 (14:42 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 8 Feb 2012 20:42:57 +0000 (14:42 -0600)
commit5ae35d3c9de3571342b7637cb41c8e698d790420
treee35d9bdcd1a3f4cd7c0a788cc6ecf2d7025252ad
parent30e3cf7cb6a9715a9d851f6538cb4c8a1e6c4421
parented3cbb329d9820838cb884baf3cdc3e1cb569f5b
Merge branch 'dev' of git://git.auf.org/auf_rh_dae into dev