Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Sat, 23 Apr 2016 02:12:01 +0000 (22:12 -0400)
committerEquinox <info@esilibrary.com>
Sat, 23 Apr 2016 02:12:01 +0000 (22:12 -0400)

Trivial merge