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

Trivial merge