From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 30 Jul 2015 16:27:28 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/web-client-p3
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f5f1edcbeca3a5b9f7cc4fc8a36cb2231890dc59;p=working%2FEvergreen.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/web-client-p3
---

f5f1edcbeca3a5b9f7cc4fc8a36cb2231890dc59