[Pkg-virtualbox-commits] [virtualbox] 09/14: Merge branch 'master' of https://github.com/LocutusOfBorg/virtualbox into gianfranco-master

[Ritesh Raj Sarraf]

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

rrs pushed a commit to branch master
in repository virtualbox.

commit 11e69e93c1a3765687f9853bf1caec5455a500d7
Merge: fc3fd3e 366d739
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sat Apr 5 14:55:17 2014 -0400

    Merge branch 'master' of https://github.com/LocutusOfBorg/virtualbox into gianfranco-master
    
    Conflicts:
    	debian/changelog

 debian/changelog                       |  2 ++
 debian/control                         | 17 +++++++++--------
 debian/virtualbox-qt.lintian-overrides |  1 -
 debian/virtualbox.lintian-overrides    | 12 ------------
 4 files changed, 11 insertions(+), 21 deletions(-)

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