[SCM] Seamless communication between many kinds of Unix branch, ubuntu, updated. 0d65d4c5b128d974fbc50433adf010776925d96b

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit 7fad000533e651cfaebc11c2d39fa6960398709d
Merge: 331b2d11b9ac06d08a151d100f8705e0eab88c57 408e096fc204e2cfed6d2537b1429fd970d78849
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 8 16:31:33 2012 +0200

    Merge branch 'debian' into ubuntu

diff --combined debian/changelog
index 2212b5b,c9ae2a9..4953e3f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,11 +1,11 @@@
- xpa (2.1.13-1~ubuntu1) oneiric; urgency=low
 -xpa (2.1.14-1) unstable; urgency=low
++xpa (2.1.14-1~ubuntu1) oneiric; urgency=low
  
-   * Initial release. 
+   * New upstream version.
+ 
+  -- Ole Streicher <debian at liska.ath.cx>  Fri, 08 Jun 2012 16:05:54 +0200
+ 
+ xpa (2.1.13-1) unstable; urgency=low
+ 
 -  * Initial release. (Closes: #655651)
++  * Initial release.
  
 - -- Ole Streicher <debian at liska.ath.cx>  Thu, 26 Jan 2012 09:20:00 +0100
 + -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Fri, 03 Feb 2012 13:00:00 +0100

-- 
Seamless communication between many kinds of Unix