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