Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 13 Mar 2013 21:42:01 +0000 (17:42 -0400)
committerEquinox <info@esilibrary.com>
Wed, 13 Mar 2013 21:42:01 +0000 (17:42 -0400)

Trivial merge