[Pkg-xen-changes] [xen] 03/07: Merge branch 'feature/bug466683+612403' into develop

[Bastian Blank]

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

waldi pushed a commit to branch develop
in repository xen.

commit 7d1071ecfc0e1bf06772628f50e3342909b179c0
Merge: e12936d c66cc3d
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Sep 6 15:32:18 2014 +0200

    Merge branch 'feature/bug466683+612403' into develop

 debian/changelog                 |  7 +++++++
 debian/templates/control.main.in | 35 ++++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)

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