[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.10.5-1-6-g7c279af

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 7f82cdb3a4431c76e4ee09ad9c1921753ff1d916
Merge: 004b2ca40e92740675eb86ab2fbdbea1fd3dc5d1 d3485e1d2a92b3369a40f7214e456cc7ed5b391e
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Jul 30 13:22:58 2011 +0200

    Merge commit 'upstream/1.10.6' into debian
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index a72113c,9e1c745..fc4ccc8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
 -libguestfs (1.10.6-1) unstable; urgency=low
++libguestfs (1.10.6-1) UNRELEASED; urgency=low
+ 
 -  * release: New upstream version 1.10.6.
++  * New upstream version
+ 
 - -- Richard W.M. Jones <rjones at redhat.com>  Thu,  9 Dec 2010 12:00:00 +0000
++ -- Hilko Bengen <bengen at debian.org>  Sat, 30 Jul 2011 13:22:04 +0200
++
 +libguestfs (1.10.5-1) experimental; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 29 Jul 2011 23:42:50 +0200
  
  libguestfs (1.0.84-4) unstable; urgency=low
  

-- 
Libguestfs Debian packaging