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

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit ceac71b4a4393506ca65050049d2b7aac11a87ee
Merge: 1b0de90678eff7d659d90eab158c8760e2f3a31d 1473e3c84d830f90d43556b7aa38db8f78108943
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 27 09:31:05 2012 +0100

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index ef61f1e,2674986..63cb9a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- xpa (2.1.13-0~ubuntu1) oneiric; urgency=low
 -xpa (2.1.13-1) unstable; urgency=low
++xpa (2.1.13-0~ubuntu2) oneiric; urgency=low
  
 -  * Initial release. (Closes: #655651)
 +  * Initial release. 
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Wed, 11 Jan 2012 18:51:20 +0100
 - -- Ole Streicher <debian at liska.ath.cx>  Thu, 26 Jan 2012 09:20:00 +0100
++ -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Thu, 26 Jan 2012 09:20:00 +0100

-- 
Seamless communication between many kinds of Unix