Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sat, 17 Jan 2015 15:35:29 +0000 (10:35 -0500)
committerDan Scott <dscott@laurentian.ca>
Sat, 17 Jan 2015 15:35:29 +0000 (10:35 -0500)
commit512b1c643f4d70f72605b99d2ddf57a3284b05f9
tree726f260df34e08d1f40c4d24a6b39186edf611a9
parente87d89f7ec7dfb8fe848ccdf960445e252793af3
parent7ca33962d23d4e9d8d9ad98f9864e404d9617f83
Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac