From: Michael Peters Date: Thu, 4 Oct 2012 19:15:02 +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=03c3f6cb3931fec4748a2b0f6701b4310494df12;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 03c3f6cb3931fec4748a2b0f6701b4310494df12