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