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