Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Fri, 16 Jan 2015 20:21:33 +0000 (15:21 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 16 Jan 2015 20:21:33 +0000 (15:21 -0500)
commite87d89f7ec7dfb8fe848ccdf960445e252793af3
tree96dabbe2629062aac4ff35a3aa4d5e9cc2f13d67
parent882b2430775c304efd56f7720ee0a3128a3dbda8
parent48cd134555f5744d250daa8988bece4bb91ca403
Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac