Merge remote-tracking branch 'origin/master' into angular1_5_1
authorGalen Charlton <gmc@esilibrary.com>
Wed, 20 Apr 2016 14:59:57 +0000 (10:59 -0400)
committerGalen Charlton <gmc@esilibrary.com>
Wed, 20 Apr 2016 14:59:57 +0000 (10:59 -0400)
commit5b30b75be8421b4148a430aee0c3d4008cfba1c9
tree991bbaab15506c68077adfd5e06a4a6a3ddf2ea3
parentd200bf15315a22f95d4b0d4fd1a78e1d00f31128
parent7212b5074df1cda1af1aef2ec6a7aa600c3c6c04
Merge remote-tracking branch 'origin/master' into angular1_5_1

Conflicts:
Open-ILS/web/js/ui/default/staff/bower.json
Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
Open-ILS/src/templates/staff/base_js.tt2
Open-ILS/src/templates/staff/share/t_autogrid.tt2
Open-ILS/web/js/ui/default/staff/bower.json
Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js