Merge branch 'master' of git.evergreen-ils.org:Evergreen into kids-opac
authorBill Erickson <berick@esilibrary.com>
Tue, 29 May 2012 15:46:07 +0000 (11:46 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 29 May 2012 15:46:07 +0000 (11:46 -0400)
commit29c418a6bc329a187c778a83b097cd36a6f490f3
treee3304a3fa35697f03b824647ee7166a335b59faf
parentcfaba985a9cd2d3dd17361a03cc312bc5e64f265
parentf58737e7f2a78c48c36a0dcdb06dc39f2255021a
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kids-opac
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Open-ILS/src/sql/Pg/950.data.seed-values.sql