From: Michael Peters Date: Fri, 11 Jan 2013 19:15:08 +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=b8438587583de107601aa35164d55a2722a860c7;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- b8438587583de107601aa35164d55a2722a860c7