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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 0a5ab44acb86e5718464604aabe3e2da9a9144d2
Merge: 6fad64fadd8dcfb6467be06477e0b61a4af711a0 c1654c5cb4f01827a589ee23d06a01359ee6837a
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Nov 13 17:48:20 2011 +0100

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


-- 
BOINC packaging