Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/sqitch...
authorBill Erickson <berickxx@gmail.com>
Thu, 15 Oct 2015 14:19:00 +0000 (10:19 -0400)
committerBill Erickson <berickxx@gmail.com>
Thu, 15 Oct 2015 14:19:00 +0000 (10:19 -0400)

Trivial merge