From: Michael Peters Date: Wed, 16 Jan 2013 16:15:07 +0000 (-0500) 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=e0244fe8a0e4454bbb630c39faec3f11bf4590a2;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- e0244fe8a0e4454bbb630c39faec3f11bf4590a2