Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac
authorBill Erickson <berick@esilibrary.com>
Tue, 15 May 2012 16:55:44 +0000 (12:55 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 15 May 2012 16:55:44 +0000 (12:55 -0400)
commit8d0b6b94b6abb6038f08d1ce8ff073b444547bdd
tree290dba1ffa365def7652b846c81140eede6fc03c
parentccf932011e2f73ed0bb4e63c1069f90c32b6cf83
parentebdf3e9527c2755195d3126b5468e4636ea5cc6a
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac

Minor conflict repair

Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm