From: Bill Erickson Date: Fri, 25 May 2012 13:26:54 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bac6782e60e5cdd656442665455db01ec62f4c77;p=evergreen%2Fequinox.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac --- bac6782e60e5cdd656442665455db01ec62f4c77