Support inline input (pre-edit,surrounding-text)
Debian packaging: provide x-window-manager
Merge pull request #1637 from luyikei/fix-im-problem

Support inline input (pre-edit,surrounding-text) when using input-method, Fix #1071
1.7.2
Merge remote-tracking branch 'upstream/master'
[Alt-Tab] Work around left-scroll arrow having no right margin.
[Alt-Tab] Revert all multi-ws work, which is now an extension.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/org.cinnamon.gschema.xml.in
	js/ui/windowManager.js