Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 3 Jun 2015 17:21:02 +0000 (13:21 -0400)
committerEquinox <info@esilibrary.com>
Wed, 3 Jun 2015 17:21:02 +0000 (13:21 -0400)

Trivial merge