From: Dan Scott Date: Wed, 1 Aug 2012 21:04:16 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1756315cc51f45878cdd814c63611dec5e249da1;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery Conflicts: Open-ILS/src/sql/Pg/002.schema.config.sql Open-ILS/src/templates/opac/parts/record/summary.tt2 Open-ILS/src/templates/opac/parts/result/table.tt2 Signed-off-by: Dan Scott --- 1756315cc51f45878cdd814c63611dec5e249da1