Merge branch 'release/1.7' into dev
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 14 Mar 2013 14:20:59 +0000 (10:20 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 14 Mar 2013 14:20:59 +0000 (10:20 -0400)
commitc981bd5b5a7b36cb8a1dadcf60dfa4e8f4f80b94
treeb80b64a66a646bfba3004b9b0606143da8c1603f
parent765e90d92bb96c329407e072d0e88033c5b0d365
parentd2347952f6fa65e66d9196a5d6e7e6101a7d0029
Merge branch 'release/1.7' into dev