Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Mon, 16 Feb 2015 23:03:01 +0000 (18:03 -0500)
committerEquinox <info@esilibrary.com>
Mon, 16 Feb 2015 23:03:01 +0000 (18:03 -0500)

Trivial merge