Merge branch 'master' of git.evergreen-ils.org:contrib/equinox
authorJason Etheridge <jason@esilibrary.com>
Fri, 28 Mar 2014 20:19:43 +0000 (16:19 -0400)
committerJason Etheridge <jason@esilibrary.com>
Fri, 28 Mar 2014 20:19:43 +0000 (16:19 -0400)

Trivial merge