Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 7 Mar 2014 18:06:02 +0000 (13:06 -0500)
committerEquinox <info@esilibrary.com>
Fri, 7 Mar 2014 18:06:02 +0000 (13:06 -0500)

Trivial merge