xserver-xorg-video-mga: Changes to 'ubuntu'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 debian/changelog |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 712458b836c1894a7317191b2fe157059ba1f46c
Author: Timo Aaltonen <Timo Aaltonen tjaalton@cc.hut.fi>
Date:   Wed Sep 26 11:08:21 2012 +0300

    uploaded to quantal

diff --git a/debian/changelog b/debian/changelog
index ca43f6b..0a79113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mga (1:1.6.0-0ubuntu1) quantal-proposed; urgency=low
+
+  * Sync from unreleased debian git.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 01 Aug 2012 18:37:52 +0300
+
 xserver-xorg-video-mga (1:1.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d833c29..c1ae3fc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xserver-xorg-video-mga
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders:
  Cyril Brulebois <kibi@debian.org>,
  Tormod Volden <debian.tormod@gmail.com>