[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 02/03: Merge tag 'upstream/4.3.14'

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository virtualbox-guest-additions-iso.

commit ed4cbbcdb72bdf311844e55c3602319b4dbcc02b
Merge: c1bbfb3 e7ffad6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jul 23 12:34:51 2014 +0200

    Merge tag 'upstream/4.3.14'
    
    Upstream version 4.3.14
    
    Conflicts:
    	VBoxGuestAdditions_4.3.12.iso
    	VBoxGuestAdditions_4.3.14.iso
    	VBoxGuestAdditions_4.3.8.iso

 ...ons_4.3.12.iso => VBoxGuestAdditions_4.3.14.iso | Bin 64770048 -> 65943552 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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