From: Michael Peters Date: Sat, 27 Oct 2012 00:15:01 +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=4eb03a03cd254655e5aabd77b9e07bbd7a96c50c;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 4eb03a03cd254655e5aabd77b9e07bbd7a96c50c