[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 01/01: Merge branch 'jessie'

[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 0f804b033ad3148c3b5a0d8081aac383dfdb7127
Merge: ebe9692 9970b90
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Mar 13 08:51:20 2015 +0100

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 72f6c2f,1c94c9b..7c6f8ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,8 +1,33 @@@
- virtualbox-guest-additions-iso (4.3.24-2) UNRELEASED; urgency=medium
++virtualbox-guest-additions-iso (4.3.24-2) experimental; urgency=medium
 +
 +   * Conflict with upstream proprietary packages 4.3 series.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 08 Mar 2015 12:40:25 +0100
 +
 +virtualbox-guest-additions-iso (4.3.24-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 03 Mar 2015 14:14:59 +0100
 +
 +virtualbox-guest-additions-iso (4.3.22-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Update copyright year.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 13 Feb 2015 12:01:27 +0100
 +
 +virtualbox-guest-additions-iso (4.3.20-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 03 Dec 2014 09:55:53 +0100
++
+ virtualbox-guest-additions-iso (4.3.18-2) unstable; urgency=medium
+ 
+   * Conflict with upstream proprietary packages 4.3 series.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 09 Mar 2015 10:22:07 +0100
  
  virtualbox-guest-additions-iso (4.3.18-1) unstable; urgency=medium
  

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