Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Mon, 10 Nov 2014 19:48:01 +0000 (14:48 -0500)
committerEquinox <info@esilibrary.com>
Mon, 10 Nov 2014 19:48:01 +0000 (14:48 -0500)

Trivial merge