[mate-user-share] 01/06: 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-user-share.

commit b4e4c849a584950a10cbea187a89f34697d01b89
Merge: 21ff363 fe3c3d7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 2 05:58:04 2015 +0200

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

 debian/changelog                                   | 25 +++++++
 debian/control                                     | 55 ++++++++------
 debian/copyright                                   | 85 ++++++++++++++++++++++
 debian/mate-user-share-common.install              |  8 ++
 debian/mate-user-share.install                     |  6 +-
 .../1002_add-keywords-key-to-desktop-files.patch   | 13 ----
 .../2001_omit-gfdl-licensed-help-files.patch       | 20 -----
 debian/patches/series                              |  2 -
 debian/rules                                       | 31 +-------
 debian/watch                                       |  1 -
 10 files changed, 159 insertions(+), 87 deletions(-)

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