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