From: Bill Erickson Date: Wed, 18 Apr 2012 12:56:14 +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=refs%2Fheads%2Fkpac-scratch;p=evergreen%2Fequinox.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac --- e2c6e763bb04c02e7f9762e3e4392543dd31f95c