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