From: Michael Peters Date: Fri, 28 Sep 2012 14: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=230980b87638b1339dd378a19ec90aad5e84ab9d;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 230980b87638b1339dd378a19ec90aad5e84ab9d