[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 01/01: Merge branch 'master' into experimental

[Gianfranco Costamagna]

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

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

commit 259dcb7335e42b43108c472a82613e1f55abf3e2
Merge: 90c3561 09a6e6b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Apr 30 09:56:11 2015 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 2114efa,c8846f0..fb1389d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +virtualbox-guest-additions-iso (5.0.0~BETA1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Conflict with upstream proprietary packages 5.0 series.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 03 Apr 2015 10:01:57 +0200
 +
+ virtualbox-guest-additions-iso (4.3.26-2) unstable; urgency=medium
+ 
+   * Upload to Unstable
+ 
+  -- Ritesh Raj Sarraf <rrs at debian.org>  Thu, 30 Apr 2015 12:24:46 +0530
+ 
  virtualbox-guest-additions-iso (4.3.26-1) experimental; urgency=medium
  
     * New upstream release.

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