Merge remote-tracking branch 'working/user/berick/clear-shelf-shows-pickup-change...
authorJason Stephenson <jstephenson@mvlc.org>
Wed, 13 Mar 2013 13:45:54 +0000 (09:45 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 13 Mar 2013 13:45:54 +0000 (09:45 -0400)
commitd51756b313eef9774a413c768f7ea400f133b418
treeab0bb28ad6ee4e26552f6c4311f9c4df1bdebcac
parenta0ae7d7793680272e273c00283df986f512da9ab
parent37855403d759d8d2150af5016b0f65c7f2bfe83d
Merge remote-tracking branch 'working/user/berick/clear-shelf-shows-pickup-change-no-setting' into 201303013
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/xul/staff_client/server/locale/en-US/circ.properties