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