[mate-session-manager] 01/03: Merge branch 'debian/experimental'

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-session-manager.

commit 7caf1a8beaf59d2c2e4c5d30b9afe89eaede4e49
Merge: d3da2ac b43779a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 3 07:34:26 2015 +0200

    Merge branch 'debian/experimental'
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                                   | 44 ++++++++++
 debian/control                                     | 41 ++++-----
 debian/copyright                                   |  5 ++
 ...low-users-to-disable-one-or-both-compatib.patch | 97 ----------------------
 ...low-users-to-disable-one-or-both-compatib.patch | 65 ---------------
 .../0003_set-XDG-CURRENT-DESKTOP-if-empty.patch    | 22 -----
 .../0004_no-crash-if-no-req-apps-found.patch       | 43 ----------
 ...001_hypen-used-as-minus-sign-man-page-fix.patch | 40 ---------
 debian/patches/1002_libsystemd-transition.patch    |  3 +
 debian/patches/series                              |  5 --
 debian/rules                                       |  2 -
 11 files changed, 73 insertions(+), 294 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-session-manager.git