Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/webby-misc...
authorBill Erickson <berickxx@gmail.com>
Fri, 12 Dec 2014 15:10:03 +0000 (10:10 -0500)
committerBill Erickson <berickxx@gmail.com>
Fri, 12 Dec 2014 15:10:03 +0000 (10:10 -0500)

Trivial merge