Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-invoice-inline...
authorBill Erickson <berick@esilibrary.com>
Mon, 16 Jul 2012 15:43:02 +0000 (11:43 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 16 Jul 2012 15:43:02 +0000 (11:43 -0400)

Trivial merge