Merge remote-tracking branch 'remotes/conifer/feature/tpac_conifer_2_7' into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:02:15 +0000 (16:02 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:02:15 +0000 (16:02 -0500)
commit54be2e31e79ea11cd85f4ad73dff9979e62734ab
tree7f441a2a36e42add1790c59cc195f9668e748885
parenta29cf1b5dfc3a4841678557f19070172c51a59bd
parent543782a289265ab973364bf38c7a0897cd912051
Merge remote-tracking branch 'remotes/conifer/feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac