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