Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 4 Sep 2013 15:12:02 +0000 (11:12 -0400)
committerEquinox <info@esilibrary.com>
Wed, 4 Sep 2013 15:12:02 +0000 (11:12 -0400)

Trivial merge