From: Michael Peters Date: Fri, 12 Oct 2012 00: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=e17c962ab6174b3bce3ba90b3be717cad7e1f900;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- e17c962ab6174b3bce3ba90b3be717cad7e1f900