From: Michael Peters Date: Wed, 21 Nov 2012 16: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=3c52fa26214d118f3ea74d37c638a1c41531ecbe;p=working%2FEvergreen.git Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen --- 3c52fa26214d118f3ea74d37c638a1c41531ecbe