The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 4cf7d6e4a34f04812d487fccf8ea902d234254c1
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date:   Thu Sep 22 11:10:11 2011 +0200

    fixed changelog mismerge

diff --git a/changelog b/changelog
index 928e940..5e73eda 100644
--- a/changelog
+++ b/changelog
@@ -8,7 +8,6 @@ libreoffice (1:3.4.3-1ubuntu3) UNRELEASED; urgency=low
 
  -- Bjoern Michaelsen <bjoern.michael...@canonical.com>  Wed, 21 Sep 2011 
14:59:06 +0200
 
- -- Bjoern Michaelsen <bjoern.michael...@canonical.com>  Tue, 13 Sep 2011 
11:52:25 +0200
 libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
 
   [ Rene Engelhard ]

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r6fif-0008mr...@vasks.debian.org

Reply via email to