Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/miker/lp1053397...
authorBill Erickson <berick@esilibrary.com>
Mon, 3 Feb 2014 20:36:44 +0000 (15:36 -0500)
committerBill Erickson <berick@esilibrary.com>
Mon, 3 Feb 2014 20:36:44 +0000 (15:36 -0500)

Trivial merge