Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Tue, 6 Nov 2012 16:09:03 +0000 (11:09 -0500)
committerEquinox <info@esilibrary.com>
Tue, 6 Nov 2012 16:09:03 +0000 (11:09 -0500)

Trivial merge