Merge remote-tracking branch 'remotes/conifer/feature/tpac_uhearst_2_7' into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:04:02 +0000 (16:04 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:04:02 +0000 (16:04 -0500)
commite0c37cd785f66368360e664ec297da2f714054f5
tree0b2004c66a5c5cdfa506f9107efaeb0dc6a68bc8
parent7eeac662c4ac08b4e61dad5b0e8d248c92d8f14b
parent16baee890e3d6370c3fdc970a4db2923a961a691
Merge remote-tracking branch 'remotes/conifer/feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac