From: Bill Erickson <berick@esilibrary.com>
Date: Fri, 8 Jul 2011 14:00:23 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=28e75a88450a736f5ad4fc62b5e4e546b159e423;p=contrib%2FConifer.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
---

28e75a88450a736f5ad4fc62b5e4e546b159e423