Merge changes from trunk to fix workstation registration and the like
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 10 Mar 2008 02:08:11 +0000 (02:08 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 10 Mar 2008 02:08:11 +0000 (02:08 +0000)
commit41d5ac288e0c661308a7c7d89142f78bb4d689c0
tree615db8aff9dd1296598df86e578238425605d0b6
parent3987a6e10f586d8d85500171fce793dffd84b1ce
Merge changes from trunk to fix workstation registration and the like

svn merge -r8766:8767 svn://svn.open-ils.org/ILS/trunk
svn merge -r8704:8705 svn://svn.open-ils.org/ILS/trunk
svn merge -r8807:8808 svn://svn.open-ils.org/ILS/trunk
svn merge -r8664:8666 svn://svn.open-ils.org/ILS/trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8947 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
Open-ILS/src/perlmods/OpenILS/Application/Actor/UserGroups.pm
Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
Open-ILS/src/perlmods/OpenILS/Application/Circ/CopyLocations.pm
Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
Open-ILS/src/perlmods/OpenILS/Application/Circ/NonCat.pm
Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm