Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/sqitch...
authorBill Erickson <berickxx@gmail.com>
Wed, 28 Oct 2015 15:40:23 +0000 (11:40 -0400)
committerBill Erickson <berickxx@gmail.com>
Wed, 28 Oct 2015 15:40:23 +0000 (11:40 -0400)

Trivial merge