Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Sun, 25 Oct 2015 15:02:46 +0000 (11:02 -0400)
committerBill Erickson <berickxx@gmail.com>
Sun, 25 Oct 2015 15:02:46 +0000 (11:02 -0400)

Trivial merge