Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Thu, 5 Nov 2015 14:50:42 +0000 (09:50 -0500)
committerBill Erickson <berickxx@gmail.com>
Thu, 5 Nov 2015 14:50:42 +0000 (09:50 -0500)

Trivial merge