Merge branch 'feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sun, 11 Jan 2015 03:27:39 +0000 (22:27 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 11 Jan 2015 03:27:39 +0000 (22:27 -0500)
commit1b63919f3cda0084f68b255aa4290353eaa25101
treee6c636e5afee8a65bdc62367bfb2d1968ded9753
parent05b59196b3bc55ebfe205fb8306090fbf6dedaf3
parent14814f58cd8dd9558a7125a760c770a30616a28d
Merge branch 'feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac