From: Michael Peters Date: Wed, 10 Oct 2012 20:15:06 +0000 (-0400) Subject: Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=85634a0fce82efdab14b63696cea835a40738690;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 85634a0fce82efdab14b63696cea835a40738690