Merge remote branch 'working/collab/miker/lp1053397-tpac-metarecords-plus-composite...
authorBill Erickson <berick@esilibrary.com>
Thu, 6 Feb 2014 17:31:35 +0000 (12:31 -0500)
committerBill Erickson <berick@esilibrary.com>
Thu, 6 Feb 2014 17:31:35 +0000 (12:31 -0500)

Trivial merge