Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 21 Aug 2014 16:06:04 +0000 (12:06 -0400)
committerEquinox <info@esilibrary.com>
Thu, 21 Aug 2014 16:06:04 +0000 (12:06 -0400)

Trivial merge