Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 15 Nov 2012 09:51:05 +0000 (04:51 -0500)
committerEquinox <info@esilibrary.com>
Thu, 15 Nov 2012 09:51:05 +0000 (04:51 -0500)

Trivial merge