From: Michael Peters Date: Fri, 4 Jan 2013 21: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=118503621981757952efba37ebbf1dfeb9be153e;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 118503621981757952efba37ebbf1dfeb9be153e