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