[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.11.4-1-6-gce68c81

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit f5005220c5e68de5e4ffc2adebe16e558ea8d9b6
Merge: 821edd49d8ceb001b158f54c94a8c75686a470a0 2acab886f93601957f8a67bd6d37d405e3fb5554
Author: Simon McVittie <smcv at debian.org>
Date:   Mon May 10 18:10:30 2010 +0100

    Merge branch 'debian' into debian-experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 0b42c20,a9324cd..7226453
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- telepathy-glib (0.11.4-1+exp1) UNRELEASED-experimental; urgency=low
++telepathy-glib (0.11.5-1+exp1) UNRELEASED-experimental; urgency=low
 +
 +  * Re-enable introspection (in experimental, for now)
 +
 + -- Simon McVittie <smcv at debian.org>  Wed, 28 Apr 2010 19:16:44 +0100
 +
+ telepathy-glib (0.11.5-1) unstable; urgency=low
+ 
+   * New upstream version with new API/ABI
+ 
+  -- Simon McVittie <smcv at debian.org>  Mon, 10 May 2010 17:59:54 +0100
+ 
  telepathy-glib (0.11.4-1) unstable; urgency=low
  
    * New upstream version

-- 
telepathy-glib packaging