Merge remote-tracking branch 'conifer/feature/tpac_usudbury_2_7' into rel_2_7_mergery...
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 20:30:29 +0000 (15:30 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 20:30:29 +0000 (15:30 -0500)

Trivial merge