Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Fri, 18 Sep 2015 00:02:44 +0000 (20:02 -0400)
committerBill Erickson <berickxx@gmail.com>
Fri, 18 Sep 2015 00:02:44 +0000 (20:02 -0400)

Trivial merge