Merge remote-tracking branch 'remotes/conifer/feature/marctemplates_2_7' into mergery_2_7
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:24:37 +0000 (07:24 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:24:37 +0000 (07:24 -0500)
commit2f8a0ea31ec90af636a68cfcb1857c6cec3fba31
tree9190f606bf15b192edca9b0a3515924d5709de72
parent292db1517c3ff820a2a93f80b83de5d018228a1b
parent5ed6ab43fbbbceffe67f44d7f55129d7ba643677
Merge remote-tracking branch 'remotes/conifer/feature/marctemplates_2_7' into mergery_2_7