From: Mike Rylander Date: Tue, 17 May 2011 19:01:57 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into social X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c64cd27e0c89d7552f926cde35492f81c91dadca;p=evergreen%2Fequinox.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into social --- c64cd27e0c89d7552f926cde35492f81c91dadca