From: Mike Rylander Date: Mon, 23 May 2011 15:14:41 +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=598d111851cbf03c73e6bef7633c1ca13bd72276;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen --- 598d111851cbf03c73e6bef7633c1ca13bd72276