Merge branch 'tpac_conifer_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Tue, 9 Dec 2014 20:52:41 +0000 (15:52 -0500)
committerDan Scott <dscott@laurentian.ca>
Tue, 9 Dec 2014 20:52:41 +0000 (15:52 -0500)
commit045ef94db2788e9a7fd695570867df1c2f5102eb
tree9a6e3b60a2971615338750f0be75a598034ba83c
parent4543102e1e27518725a86c0b06c9761fd5f78290
parent10f3925dfc8dc06b99bed4e20cdf56eca650991a
Merge branch 'tpac_conifer_2_7' into rel_2_7_mergery_tpac