Merge remote-tracking branch 'conifer/feature/tpac_eresources_highlander_2_7' into...
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 22:33:51 +0000 (17:33 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 22:33:51 +0000 (17:33 -0500)

Trivial merge