Merge branch 'lp1053397-tpac-metarecords' into lp1053397-tpac-metarecords-plus-composite
authorBill Erickson <berick@esilibrary.com>
Wed, 29 Jan 2014 20:56:08 +0000 (15:56 -0500)
committerBill Erickson <berick@esilibrary.com>
Wed, 29 Jan 2014 20:56:08 +0000 (15:56 -0500)

Trivial merge