Merge remote-tracking branch 'conifer/feature/tpac_algoma_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Tue, 9 Dec 2014 20:33:37 +0000 (15:33 -0500)
committerDan Scott <dscott@laurentian.ca>
Tue, 9 Dec 2014 20:33:37 +0000 (15:33 -0500)

Trivial merge