Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-invoice-inline...
authorBill Erickson <berick@esilibrary.com>
Tue, 17 Jul 2012 17:38:28 +0000 (13:38 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 17 Jul 2012 17:38:28 +0000 (13:38 -0400)

Trivial merge