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)
commit4543102e1e27518725a86c0b06c9761fd5f78290
treea5f5c959328e24edd8017c28934fe4ba26805e43
parentdf4cf0ab2d424796bf69cc04315851285921e836
parent3ef15498b7a3e1c318f401c84cf4870f2f98b6f0
Merge remote-tracking branch 'conifer/feature/tpac_algoma_2_7' into rel_2_7_mergery_tpac