[Pkg-ganeti-devel] [ganeti] 03/04: Merge tag 'debian/2.10.2-2' into bpo-wheezy

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch bpo-wheezy
in repository ganeti.

commit f51ce998cba23bd4cee326a597f175cfbb0efcc9
Merge: 88cecae 072d169
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Mar 31 09:48:43 2014 +0300

    Merge tag 'debian/2.10.2-2' into bpo-wheezy
    
    ganeti Debian release 2.10.2-2
    
    Conflicts:
    	debian/changelog
    	+ drop old bpo entry

 debian/changelog                                   |  8 ++++--
 .../0001-Fix-specification-of-TIDiskParams.patch   | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git