[SCM] xvidcore packaging branch, master-ubuntu, updated. debian/1.2.2+debian-1ubuntu2-2-gdfeb385

[lucidfox-guest at users.alioth.debian.org]

The following commit has been merged in the master-ubuntu branch:
commit dfeb385fe56c6617e9aa5f24b024a1129387eb28
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun Aug 29 18:31:55 2010 +0700

    Update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 11232b2..725f8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvidcore (2:1.2.2+debian-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian.
+
+ -- Maia Kozheva <sikon at ubuntu.com>  Sun, 29 Aug 2010 18:30:32 +0700
+
 xvidcore (2:1.2.2+debian-3) unstable; urgency=low
 
   * Update my e-mail address.

-- 
xvidcore packaging