Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 2 Apr 2014 23:24:01 +0000 (19:24 -0400)
committerEquinox <info@esilibrary.com>
Wed, 2 Apr 2014 23:24:01 +0000 (19:24 -0400)

Trivial merge