[boinc] 03/03: 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 boinc.

commit 75d8dcef7aca0c3174c305ce4df9afac664d8a51
Merge: f1a16b9 6496eb2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Dec 10 13:29:11 2014 +0100

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

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

diff --cc debian/changelog
index caa5721,0a4df16..f1bd236
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,25 @@@
 +boinc (7.4.35+dfsg-1exp1) experimental; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * New upstream release, patch refresh.
 +  * Add nvidia-modprobe as dependency (LP: #1400021)
 +  [ Vincent Danjean ]
 +  * fix gpu stuff (Closes: #763655)
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 07 Nov 2014 11:00:37 +0100
 +
+ boinc (7.4.23+dfsg-2exp1) experimental; urgency=medium
+ 
+   * Upload to experimental, with the boinc-server-* packages.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 10 Dec 2014 13:27:40 +0100
+ 
+ boinc (7.4.23+dfsg-2) unstable; urgency=low
+ 
+   * Upload to unstable.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 10 Dec 2014 13:26:02 +0100
+ 
  boinc (7.4.23+dfsg-1exp3) experimental; urgency=medium
  
    [ Nelson A. de Oliveira ]

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