From: Michael Peters Date: Tue, 13 Nov 2012 21:15:06 +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=139434afea7dd49cfe9669e39830c591067de74d;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 139434afea7dd49cfe9669e39830c591067de74d