[libreoffice] 02/02: Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4

[Rene Engelhard]

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

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

commit 23b13346e39819c81ad65ef0c7f99790c7e05ef2
Merge: ab3d8f5 791c930
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Feb 2 13:43:26 2017 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4

 changelog                                      | 16 +++++-----------
 copyright                                      |  2 +-
 missing-sources/{jquery.js => jquery-3.1.1.js} |  0
 source.lintian-overrides                       |  3 ---
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --cc changelog
index acf586c,cb1acdd..4e201e6
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,3 +1,9 @@@
 +libreoffice (1:5.4.0~alpha0~git20170201-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 +
- libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
- 
-   * debian/rules:
-     - move from hardcoded C(XX)FLAGS for -g -> -g1 to recommended
-       DEB_C(XX)FLAGS_MAINT_*
- 
-  -- Rene Engelhard <rene at debian.org>  Mon, 30 Jan 2017 15:12:29 +0100
- 
  libreoffice (1:5.3.0-1) experimental; urgency=medium
  
    * New upstream release

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