From: Jason Etheridge Date: Fri, 26 Aug 2011 20:03:15 +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=817a79b3c110e278b560f0f88f4fcfd30faa91a4;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen --- 817a79b3c110e278b560f0f88f4fcfd30faa91a4