Merge branch 'master' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 1 Aug 2012 21:04:16 +0000 (17:04 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 1 Aug 2012 21:04:16 +0000 (17:04 -0400)
commit1756315cc51f45878cdd814c63611dec5e249da1
treeed23e4b5cd17524ba2ffe00535eef451c7658795
parent8294750a92033045b39544f5bf6c1cbd51f1ff42
parent61a95875189d27ed3543f45edb63d3e243aa272a
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 <dscott@laurentian.ca>