From: Mike Rylander Date: Thu, 2 Jun 2011 14:33:35 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into patron_no_collections2 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=00c50be5a4d698a454ae879ebd02e1e3aa499a4d;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into patron_no_collections2 Signed-off-by: Mike Rylander --- 00c50be5a4d698a454ae879ebd02e1e3aa499a4d