From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 20 May 2011 14:43:47 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0ff89d8f7ffac2678a2a629e654f3effef214fff;p=evergreen%2Fequinox.git

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

0ff89d8f7ffac2678a2a629e654f3effef214fff