[mate-netbook] 01/02: 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-netbook.

commit 1e12dc00a2cd28eb194af47c2d87bace48fc8dd9
Merge: d2c3b51 0641f71
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 21 16:44:39 2015 +0200

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

 debian/changelog                                 | 10 ++++
 debian/control                                   | 52 ++++++++++++++-------
 debian/mate-netbook-common.install               |  5 ++
 debian/mate-netbook.install                      |  6 +--
 debian/patches/0001_preserve_configuration.patch | 59 ------------------------
 debian/patches/series                            |  1 -
 6 files changed, 51 insertions(+), 82 deletions(-)

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