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