Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/array_accum_2_array_agg
authorDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:43:23 +0000 (23:43 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:43:23 +0000 (23:43 -0500)
commit1262abc9da1495e04dcb0d6ce9d69fe63b7525da
tree449137ac0cc36aec8e32cbd1a926bd46b7a21ce9
parent5ab96057d2b29160fc2a52d370d7265813ebefde
parente0a936729ada587e33ab3a701901c3d0a1ed3acb
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/array_accum_2_array_agg

Conflicts:
Open-ILS/src/sql/Pg/990.schema.unapi.sql

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Open-ILS/src/sql/Pg/990.schema.unapi.sql
Open-ILS/src/sql/Pg/999.functions.global.sql