[mate-panel] 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-panel.

commit 8c051e96696b83eadbf1de674b1615e21db60525
Merge: ded0513 47f9c99
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 2 05:27:09 2015 +0200

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

 debian/changelog                                   |  49 ++++++++
 debian/control                                     | 128 ++++++++++-----------
 debian/copyright                                   |  49 +++++++-
 debian/mate-panel-common.install                   |   1 +
 .../2001_omit-gfdl-licensed-help-files.patch       |  24 ----
 debian/patches/series                              |   3 -
 debian/rules                                       |  33 +-----
 debian/watch                                       |   2 +-
 8 files changed, 162 insertions(+), 127 deletions(-)


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