From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 20 May 2011 15:13:54 +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%2Fsocial;p=evergreen%2Fequinox.git

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

c250cc7650ae9a28a616a4d97228f07a457c6388