Merge remote-tracking branch 'remotes/conifer/feature/tpac_eresources_highlander_2_7...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:24:00 +0000 (07:24 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:24:00 +0000 (07:24 -0500)
commit04977a5782c7c493591c5debe7cbdea525e42aa7
treeecdad9c0812199f956d8e8407c86dac2b4e52df9
parent2ce224f7b35f8b3b1c135942e4076226f25c4cd9
parentb3b634538d9124d6f4897257ba5f32ae44d5c936
Merge remote-tracking branch 'remotes/conifer/feature/tpac_eresources_highlander_2_7' into mergery_2_7