Merge remote-tracking branch 'remotes/conifer/feature/tpac_sjcg_2_7' into rel_2_7_mer...
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:03:54 +0000 (16:03 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:03:54 +0000 (16:03 -0500)
commit7eeac662c4ac08b4e61dad5b0e8d248c92d8f14b
treea275650f8bb1dfec745c5df996e6be0c8358a867
parent386be8f601083c83a5000fe9e1d8bc4ac5e063af
parentff3d88ff35f629e68978e4eaac3936178454d485
Merge remote-tracking branch 'remotes/conifer/feature/tpac_sjcg_2_7' into rel_2_7_mergery_tpac