From: Michael Peters Date: Wed, 3 Oct 2012 16:15:05 +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=a75d106a91a27ba676a1e795be48d094645e3642;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- a75d106a91a27ba676a1e795be48d094645e3642