[boinc] 02/02: 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 5da6f70b178fcdc477847bd82eb143fb47a68037
Merge: 1ea4965 84acd51
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Nov 7 12:36:07 2014 +0100

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

 debian/boinc-client.service | 2 +-
 debian/changelog            | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 5b70c17,8940b09..f2fecf5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
 +boinc (7.4.27+dfsg-1exp1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  [ 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-1exp3) experimental; urgency=medium
+ 
+   [ Nelson A. de Oliveira ]
+   * Fix wrong chown binary path (Closes: #768429).
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 07 Nov 2014 12:30:50 +0100
+ 
  boinc (7.4.23+dfsg-1exp2) experimental; urgency=medium
  
    * Fix other dependencies on dbg packages.

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