From: Bill Erickson Date: Tue, 26 Nov 2013 19:07:14 +0000 (-0500) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4b2e0cd73359a8dbdbf87c779c26bdb55146feb6;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto --- 4b2e0cd73359a8dbdbf87c779c26bdb55146feb6