Merge remote-tracking branch 'conifer/feature/marctemplates_2_4' into rel_2_4_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:24:39 +0000 (10:24 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:24:39 +0000 (10:24 -0400)
commitbe3976d4945198cb95f937c3a6b744e963b3c352
tree1a907575e1a5314acdc26a8c7bd4930a2640ddf9
parent83b5ff94928afc3fad2a3fea2db397b2466afcc9
parent0649f955998eef15cc3ef7e90d35b7a5f8a30317
Merge remote-tracking branch 'conifer/feature/marctemplates_2_4' into rel_2_4_mergery