Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 17:34:08 +0000 (12:34 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 17:34:08 +0000 (12:34 -0500)
commitbd19b5c7281c3a2c3a439fe2cef0e626edef4fa0
treec269b682195369fe98e9c37a6084053a54582865
parent54ebe3031d78e277841622e2141dd8f510bc902e
parent16baee890e3d6370c3fdc970a4db2923a961a691
Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac