Merge branch 'master' of git.evergreen-ils.org:Evergreen into volume_copy_delete
authorBill Erickson <berick@esilibrary.com>
Fri, 17 Jun 2011 15:39:57 +0000 (11:39 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 17 Jun 2011 15:39:57 +0000 (11:39 -0400)
commitb6e7dc7b7ba7f0bae6b88e25ae74d7d63403535e
tree22db6e281f93e4f0fd2422e0847ff12b71cb37dd
parent4f0e795e0baa4d86eed98a418f3894d1f52d49a8
parent38332f0bbc18de90a3b83876a3249b3d3e4883bc
Merge branch 'master' of git.evergreen-ils.org:Evergreen into volume_copy_delete
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/xul/staff_client/server/locale/en-US/cat.properties