Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 18:09:50 +0000 (14:09 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 18:09:50 +0000 (14:09 -0400)
commita606ebc63080b51b9d04eb026cd2925e9f8594cc
tree244e81923a5b5d9c2d81ba73c7bd774d4748511d
parent120f6986206cda89981634ffe7c50a9799e5a130
parent007195f83beb33519d90133818a7d114ae82428b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets

Conflicts:
Open-ILS/src/sql/Pg/020.schema.functions.sql
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/020.schema.functions.sql
Open-ILS/src/sql/Pg/800.fkeys.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql