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

[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-guest-additions-iso.

commit cbaabb1b24b15b6b64782cb24657ee87b4be09de
Merge: aa02bd6 efe9d57
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Thu Feb 6 20:10:05 2014 +0530

    Merge tag 'upstream/4.3.6'
    
    Upstream version 4.3.6
    
    * tag 'upstream/4.3.6':
      Imported Upstream version 4.3.6
      Imported Upstream version 4.3.2
    
    Conflicts:
    	VBoxGuestAdditions_4.2.16.iso
    	VBoxGuestAdditions_4.3.2.iso
    	VBoxGuestAdditions_4.3.6.iso

 ...tions_4.3.2.iso => VBoxGuestAdditions_4.3.6.iso | Bin 64153600 -> 64161792 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