Merge branch 'master' of git.evergreen-ils.org:Evergreen into volume_copy_delete volume_copy_delete
authorBill Erickson <berick@esilibrary.com>
Fri, 24 Jun 2011 13:29:45 +0000 (09:29 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 24 Jun 2011 13:29:45 +0000 (09:29 -0400)
commitb17dd4079545dc5511513a24df2348933d771de8
tree1720c8e00aab42f51676bd46373e39e1fd373318
parent3fcb3b2b8be560dcb3a6925ac2b0a6822aef75e5
parent2d096d936c4467ae407bc2c8ade02d96aa3e752b
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