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