Merge branch 'error_codes' of http://github.com/crhallberg/vufind into error_codes
Conflicts: themes/bootstrap3/js/common.js themes/bootstrap3/js/record.js
Please register or sign in to comment
Conflicts: themes/bootstrap3/js/common.js themes/bootstrap3/js/record.js