[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-135-g9f9f13d

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit 9f9f13dc1306b9918954991829ee26d2e0161db1
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Nov 24 18:53:17 2012 +0100

    fix changelog

diff --git a/changelog b/changelog
index 6444e1d..ff02f13 100644
--- a/changelog
+++ b/changelog
@@ -59,21 +59,9 @@ libreoffice (1:3.6.4~rc1-1) experimental; urgency=low
   * debian/libreoffice-{core,gtk3}.bug-script.in: 
     - find out whether we have Experimental features enabled
 
-<<<<<<< HEAD
  -- Rene Engelhard <rene@debian.org>  Fri, 16 Nov 2012 22:20:37 +0100
 
 libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
-=======
- -- Rene Engelhard <rene@debian.org>  Sat, 24 Nov 2012 18:31:33 +0100
-
-libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
-
-  * debian/control.in:
-    - remove obsolete Pre-Depends on ure  (>= 1.5.1+OOo3.1.1-15)
-      (by the way closes: #693626)
-  * debian/libreoffice-core.bug-control:
-    - report-with: fonts-opensymbol instead of transitional ttf-opensymbol
->>>>>>> origin/debian-experimental-3.5
 
   * new upstream release candidate
 

-- 
LibreOffice packaging repository