[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-12-g65a5ae7

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

The following commit has been merged in the debian-experimental-3.6 branch:
commit 65a5ae7d5edd768effbab146fe6f4f24eabbda0a
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Feb 7 00:21:55 2013 +0100

    fix changelog

diff --git a/changelog b/changelog
index ba06cb1..d9b4340 100644
--- a/changelog
+++ b/changelog
@@ -31,7 +31,6 @@ libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
   * debian/rules:
     - make -help-en-us break "the others" to work around 682838
       (closes: #682838) 
-<<<<<<< HEAD
     - temporarily remove wheezy backport conditionals as base-files would make
       us think we should build for wheezy right now
     - fix gdb helper installation; use upstreams install-gdb-printers
@@ -41,9 +40,6 @@ libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
       enough now
 
  -- Rene Engelhard <rene@debian.org>  Wed, 16 Jan 2013 14:25:29 +0100
-=======
-  * debian/copyright: fix: ext-sources -> src
->>>>>>> origin/debian-experimental-3.5
 
 libreoffice (1:3.6.4-1) experimental; urgency=low
 

-- 
LibreOffice packaging repository