Merge branch 'collabora' into 'collabora'

debian/changelog

debian/control

debian/localgem/sanitize-4.0.0/lib/sanitize.rb

debian/localgem/sanitize-4.0.0/lib/sanitize/config.rb

debian/localgem/sanitize-4.0.0/lib/sanitize/config/basic.rb

...an/localgem/sanitize-4.0.0/lib/sanitize/config/default.rb

...an/localgem/sanitize-4.0.0/lib/sanitize/config/relaxed.rb

...localgem/sanitize-4.0.0/lib/sanitize/config/restricted.rb

debian/localgem/sanitize-4.0.0/lib/sanitize/css.rb

...m/sanitize-4.0.0/lib/sanitize/transformers/clean_cdata.rb

...sanitize-4.0.0/lib/sanitize/transformers/clean_comment.rb

...gem/sanitize-4.0.0/lib/sanitize/transformers/clean_css.rb

...sanitize-4.0.0/lib/sanitize/transformers/clean_doctype.rb

...sanitize-4.0.0/lib/sanitize/transformers/clean_element.rb

debian/localgem/sanitize-4.0.0/lib/sanitize/version.rb

debian/patches/gemfile-tweaks.patch

debian/patches/localgem.patch