[mate-netbook] 01/01: 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 5b2d8d3a22524a113661a9b5dbf95b003c2ec897
Merge: 7bf77f9 707eb81
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 19 17:03:07 2015 +0200

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

 debian/changelog                                   | 11 +++++++++++
 .../patches/0001_respect_undecorate_setting.patch  | 22 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 11 insertions(+), 23 deletions(-)

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