Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 31 Jan 2014 21:27:01 +0000 (16:27 -0500)
committerEquinox <info@esilibrary.com>
Fri, 31 Jan 2014 21:27:01 +0000 (16:27 -0500)

Trivial merge