Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/web-client-p3
authorBill Erickson <berickxx@gmail.com>
Mon, 5 Oct 2015 01:00:13 +0000 (21:00 -0400)
committerBill Erickson <berickxx@gmail.com>
Mon, 5 Oct 2015 01:00:13 +0000 (21:00 -0400)

Trivial merge