Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 7 Mar 2012 16:53:15 +0000 (10:53 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 7 Mar 2012 16:53:15 +0000 (10:53 -0600)
commit87f8a6d2deeb5878b02001940f2216a5a7f7d458
treefb5ec8591276095a78652bd6b9f9956010366c17
parent82af5c19b989c3ba088641a2e9975fd634186b72
parent378ffe6c3d1d51b2f57d63ba327ab6537f8e1299
Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev