From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 13 Jun 2011 14:16:38 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into SIP23738
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4cb31bdd2797bd070e612874f360ba62c744013d;p=evergreen%2Fequinox.git

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

4cb31bdd2797bd070e612874f360ba62c744013d