Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 2 May 2014 21:30:02 +0000 (17:30 -0400)
committerEquinox <info@esilibrary.com>
Fri, 2 May 2014 21:30:02 +0000 (17:30 -0400)

Trivial merge