Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 14:16:44 +0000 (10:16 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 14:16:44 +0000 (10:16 -0400)
commit5214bd0840c4466ad0acf6eb9b175524ff327539
tree0e99efb8fad0df2ee3abd9eef8a69f5d69760eaf
parent6b194407415042f3546cc098c9e09a4d58d92abd
parentec980413ac34112c6994bd582c20edb30bb9aa23
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
Open-ILS/src/sql/Pg/950.data.seed-values.sql