From: Jason Etheridge <jason@esilibrary.com>
Date: Mon, 13 Jun 2011 14:36:10 +0000 (-0400)
Subject: Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into rel_2_1
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c94a441b02e677d443c84388e498c74f37768606;p=evergreen%2Fequinox.git

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

c94a441b02e677d443c84388e498c74f37768606