From: Dan Scott <dan@coffeecode.net>
Date: Wed, 25 May 2011 02:33:44 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/dbs/lp-787150-ws
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b67ebdb624479fdce8196465b451df14b9ac4f4d;p=contrib%2FConifer.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/dbs/lp-787150-ws
---

b67ebdb624479fdce8196465b451df14b9ac4f4d