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

commit ec57669f9e435b6552d0b9fec8c38e09da53de0b
Merge: 36e9f76 60f865e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 19 16:52:30 2015 +0200

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

 debian/changelog                                   |  32 +-
 debian/copyright                                   |  12 +
 debian/mate-settings-daemon-gstreamer.install      |   1 +
 .../0010_move_a11y_keybindings_to_media_keys.patch | 239 +++++++++
 debian/patches/0011_add_a11y_settings_plugin.patch | 597 +++++++++++++++++++++
 ..._gnome_a11y_schema_to_enable_applications.patch |  24 +
 .../patches/0013_monitor_gnome_schema_keys.patch   |  22 +
 debian/patches/series                              |   4 +
 8 files changed, 930 insertions(+), 1 deletion(-)

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