From: Mike Rylander Date: Wed, 18 May 2011 13:28:14 +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=bf856746e3641d2ac1728419ca06b43f5b52e347;p=evergreen%2Fequinox.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into social --- bf856746e3641d2ac1728419ca06b43f5b52e347