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