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

Trivial merge