Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 20 Aug 2014 21:18:01 +0000 (17:18 -0400)
committerEquinox <info@esilibrary.com>
Wed, 20 Aug 2014 21:18:01 +0000 (17:18 -0400)

Trivial merge