From: Dan Scott <dan@coffeecode.net>
Date: Wed, 18 May 2011 15:08:36 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into social
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcollab%2Fdbs%2Fsocial;p=working%2FEvergreen.git

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

9f7e01164842f663b9c8ed6134a26fbf571d612a