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

Trivial merge