[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-354-g2015867

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 20158676982cbd2d0b260d0e730340b454b77360
Merge: cca418b3f204c1b1b91235a18a2699541dd99c2a 72217660f71aaeb5a47cfc41cc050e1654ba5bf3
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jan 1 17:08:49 2012 +0100

    Merge commit 'upstream/7.0.7+dfsg'
    
    Conflicts:
    	version.h


-- 
BOINC packaging