[libmatekbd] 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 libmatekbd.

commit ca7ba6d8e08b8017f05962a07faf90f1f6c05637
Merge: ada316b 0b88ad4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 3 07:43:17 2015 +0200

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

 debian/changelog                 | 26 ++++++++++++++
 debian/control                   | 73 +++++++++++++++++-----------------------
 debian/copyright                 |  3 +-
 debian/libmatekbd-common.install |  2 +-
 debian/libmatekbd-dev.install    |  2 +-
 debian/rules                     |  3 +-
 6 files changed, 63 insertions(+), 46 deletions(-)

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