From: Dan Wells Date: Fri, 20 May 2011 15:30:18 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6ed30af500c4267932856ff4cab60dae931ac4aa;p=evergreen%2Fequinox.git Merge branch 'master' of git.evergreen-ils.org:Evergreen --- 6ed30af500c4267932856ff4cab60dae931ac4aa