From: Michael Peters Date: Sat, 19 Jan 2013 20: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=30cfc44f3dd141d85d762726e8c440ce39af5539;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 30cfc44f3dd141d85d762726e8c440ce39af5539