Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1402797...
authorBill Erickson <berickxx@gmail.com>
Tue, 30 Dec 2014 16:59:36 +0000 (11:59 -0500)
committerBill Erickson <berickxx@gmail.com>
Tue, 30 Dec 2014 16:59:36 +0000 (11:59 -0500)

Trivial merge