[libixion] 06/06: fix merge

[Rene Engelhard]

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

rene pushed a commit to branch experimental
in repository libixion.

commit fdc91417a86f1a19a7e0af863fcd92325d58cec4
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 22:24:53 2016 +0200

    fix merge
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 92a8269..f035a72 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libixion
 Priority: optional
-Maintainer: Rene Engelhard <rene at debian.org>
+Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Uploaders: Rene Engelhard <rene at debian.org>
 Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-thread-dev, libboost-program-options-dev, libmdds-dev (>= 1.2), python3-dev, dh-python, sphinx-common
 Build-Depends-Indep: doxygen, python3-sphinx, python3-sphinx-bootstrap-theme,python3-breathe
 Standards-Version: 3.9.3

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