From: Bill Erickson Date: Mon, 16 Dec 2013 14:14:12 +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=7ebc2ed2a24bb259fb895e7b7bc0a5508cc0ec25;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto --- 7ebc2ed2a24bb259fb895e7b7bc0a5508cc0ec25