Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 27 Feb 2014 22:45:01 +0000 (17:45 -0500)
committerEquinox <info@esilibrary.com>
Thu, 27 Feb 2014 22:45:01 +0000 (17:45 -0500)

Trivial merge