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