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