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