[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1

[Rene Engelhard <rene@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.

commit 2550ea2df1ecdc39ae00f4322637fe5060398b4d
Merge: 0f96d16 16263bb
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Feb 5 14:10:20 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.1

 patches/gcj-safe-jni-h-include.diff | 2 +-
 patches/series                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc patches/series
index 5b40390,ebd4c91..491df35
--- a/patches/series
+++ b/patches/series
@@@ -27,9 -29,7 +28,8 @@@ odk-no-dot.dif
  hppa-is-32bit.diff
  gcj-no-bitness-check.diff
  rsc-no-error-about-unknown-switch.diff
 -liborcus-0.9.1.diff
  debian-branding.diff
 -icu-56.diff
 +disable-npapi-plugin-support.diff
 +gcc-6.diff
 +GCC-6-PR69273-workaround.diff
  bash-completion-dir.diff
- kfreebsd-openjdk8-JAVAINC.diff

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