Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorAngela Kilsdonk <akilsdonk@esilibrary.com>
Wed, 24 Jun 2015 16:55:03 +0000 (11:55 -0500)
committerAngela Kilsdonk <akilsdonk@esilibrary.com>
Wed, 24 Jun 2015 16:55:03 +0000 (11:55 -0500)

Trivial merge