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

commit b4a633bae13591ae872f3db692f7369f04cf3ceb
Merge: 31f6154 8a58be9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 3 07:45:37 2015 +0200

    Merge branch 'debian/experimental'

 debian/caja-common.install                         |   3 +
 debian/caja.install                                |   2 -
 debian/changelog                                   |  58 ++++
 debian/control                                     | 141 ++++-----
 debian/copyright                                   |  12 +-
 debian/libcaja-extension-dev.install               |   1 +
 debian/libcaja-extension1.install                  |   2 +-
 debian/patches/0001_fix-desktop-icon-size.patch    |  32 --
 ...nt-start-desktop-outside-of-MATE-sessions.patch |  22 --
 .../patches/0003_fix-crash-in-places-sidebar.patch |  36 ---
 ...4_avoid-automounts-while-screen-is-locked.patch | 334 ---------------------
 debian/patches/series                              |   4 -
 debian/rules                                       |  19 +-
 debian/watch                                       |   1 -
 14 files changed, 146 insertions(+), 521 deletions(-)

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