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