Merge branch 'nextRelease' into nr/testHarness_subProjects
commit95abb2bc59d1054e22e3a072cda3c7d1af256466
authorMartin Beaudoin <beaudoin.martin@gmail.com>
Sun, 13 Sep 2015 20:22:57 +0000 (13 16:22 -0400)
committerMartin Beaudoin <beaudoin.martin@gmail.com>
Sun, 13 Sep 2015 20:22:57 +0000 (13 16:22 -0400)
treeab1d24ecb7eff5232b169eafb58cb81a774644f6
parent1899be993a8e0c03013474458a731a19c46b60f4
parentc08017d9468ed82dbb0040319d3be2239f2c9319
Merge branch 'nextRelease' into nr/testHarness_subProjects