From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Tue, 19 Jul 2011 21:04:38 +0000 (-0400)
Subject: Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ebf39c188a76d5a2fcdb283f334319a63d9f8570;p=contrib%2FConifer.git

Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
---

ebf39c188a76d5a2fcdb283f334319a63d9f8570