[SCM] OpenOffice.org packaging repository branch, ubuntu-natty-3.3.1, updated. cb52c172e18f51044d76cb99456f0a5570f83c53

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit cb52c172e18f51044d76cb99456f0a5570f83c53
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Mar 1 23:52:37 2011 +0100

    first ubuntu transitional release: 3.3.0-6ubuntu1

diff --git a/changelog b/changelog
index 8392946..bbe5a5d 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,15 @@
-openoffice.org (1:3.3.0-7ubuntu1) UNRELEASED; urgency=low
+openoffice.org (1:3.3.0-6ubuntu1) natty; urgency=low
 
+  [ Bjoern Michaelsen ]
   * moving transitional packages from libreoffice to openoffice.org source
+  * merged master up to 02f0bb37b2c26a43005695b5e7bcdc1fda970621
+  * add preinst hooks for removal of /usr/share/doc symlinks
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 01 Mar 2011 19:31:10 +0100
+  [ Rene Engelhard ]
+  * all changes up to 3.3.0-6
+  * add oo* symlinks (closes: #614840)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 01 Mar 2011 23:48:44 +0100
 
 openoffice.org (1:3.3.0-7) UNRELEASED; urgency=low
 

-- 
OpenOffice.org packaging repository