Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/senator/simplifi...
authorBill Erickson <berick@esilibrary.com>
Mon, 23 Apr 2012 15:04:45 +0000 (11:04 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 23 Apr 2012 15:04:45 +0000 (11:04 -0400)

Trivial merge