From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 13 Nov 2013 13:52:44 +0000 (-0500)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into ff-as-eg-branch-ui
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7e766c84acf26f34521cc8e64c00ed4a7bd97335;p=evergreen%2Fequinox.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into ff-as-eg-branch-ui
---

7e766c84acf26f34521cc8e64c00ed4a7bd97335