Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/patron...
authorBill Erickson <berickxx@gmail.com>
Sat, 5 Mar 2016 20:03:43 +0000 (15:03 -0500)
committerBill Erickson <berickxx@gmail.com>
Sat, 5 Mar 2016 20:03:43 +0000 (15:03 -0500)

Trivial merge