Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 17:30:54 +0000 (12:30 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 17:30:54 +0000 (12:30 -0500)
commit54ebe3031d78e277841622e2141dd8f510bc902e
tree7106b4d7f1da7094971dc073ca02a324d05e4294
parente6c5237378a2a6c6a8f06148a48003e6b516a619
parentc7490da5948bde9118422a71c4af13cf65705797
Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac