Merge branch 'maint-0.99' into maint-1.0
- maint-0.99: BibClassify: escape keywords in tag cloud and MARCXML WebComment: escape review "title"
Conflicts:
modules/bibclassify/lib/bibclassifylib.py
modules/webcomment/lib/webcomment_templates.py
Tibor Simko <tibor.simko@cern.ch> | Apr 4 2013, 16:37 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
04116f326260 | Jerome Caffaro/Tibor Simko | BibClassify: escape keywords in tag cloud and MARCXML | Apr 4 2013 | |||
28d35558729e | Jerome Caffaro/Tibor Simko | WebComment: escape review "title" | Apr 4 2013 |