From: Galen Charlton <gmc@esilibrary.com>
Date: Mon, 16 May 2011 17:29:32 +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=02716600969820d348923fc1b784b20a80477e8c;p=contrib%2FConifer.git

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

02716600969820d348923fc1b784b20a80477e8c