Merge remote-tracking branch 'conifer/feature/tpac_osul_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 13:30:16 +0000 (08:30 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 13:30:16 +0000 (08:30 -0500)

Trivial merge