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