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