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