Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Tue, 19 May 2015 12:38:18 +0000 (08:38 -0400)
committerBill Erickson <berickxx@gmail.com>
Tue, 19 May 2015 12:38:18 +0000 (08:38 -0400)

Trivial merge