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)

Trivial merge