Oops Roll this back into a branch
Merge branch 'master' of https://github.com/Teknocrat/sddm
Revert "Adding pm-utils support to sddm"

This reverts commit 613829d9803d1e0a30274bae5edd10f5a0e20dad.
Merge branch 'master' of https://github.com/Teknocrat/sddm
Revert "Support for User configurable log file and auth file"

This reverts commit 678802a3d6e8217d1d446970da0c11aabf63b788.
Set XDG_CURRENT_DESKTOP for the started session

See https://git.reviewboard.kde.org/r/117400 for details
Merge pull request #139 from MartinBriza/desktopsession

Set XDG_CURRENT_DESKTOP for the started session
Merge remote-tracking branch 'upstream/master'
Merge branch 'userconfig' of https://github.com/Teknocrat/sddm into userconfig

Conflicts:
	src/common/Configuration.cpp
	src/daemon/Authenticator.cpp
	src/daemon/Session.cpp