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
[Alt-Tab] F2: Switch to currently selected window before invoking run dialog.
[Alt-Tab] Factor out the icon-creation code.
[Alt-Tab] No change of icon-in-front-of-thumbnail size.
[Alt-Tab] Prepare for making thumbnail-behind-icon a preference.
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.
When shifting a window to another workspace, move the window before switching workspaces
Scale: Consistent spacing and text size between selected and unselected windows
Don't force decorations on desklets
Desklets: replaced min_decorations concept with prevent_decorations and redesigned styles definition
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/org.cinnamon.gschema.xml.in
	js/ui/windowManager.js
UI improvements in background selection screen
Set the settings window title with the name of the module instead of "System Settings - %s" % modulename
Applet/Desklet/Extension settings API
Add 'generic' setting type, ability to launch external settings app,
and hide configure button in cinnamon settings, based on metadata.json