From: Michael Peters Date: Sun, 23 Dec 2012 22: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=a45e830f5190e0d7553b9983e1262223b33909d4;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- a45e830f5190e0d7553b9983e1262223b33909d4