From: Bill Erickson Date: Tue, 10 Apr 2012 14:12:55 +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=c893a2decccda35415517da25a853ebac776c276;p=evergreen%2Fequinox.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac --- c893a2decccda35415517da25a853ebac776c276