Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 5 Nov 2014 16:48:02 +0000 (11:48 -0500)
committerEquinox <info@esilibrary.com>
Wed, 5 Nov 2014 16:48:02 +0000 (11:48 -0500)

Trivial merge