From: Michael Peters Date: Mon, 24 Dec 2012 06:15:02 +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=6378546d86df5ac99fbb423c6ee2be00340246af;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 6378546d86df5ac99fbb423c6ee2be00340246af