[SCM] SETI at home packaging branch, master, updated. debian/6.12_svn1305-2-24-gb2f1adf

[Steffen Moeller]

The following commit has been merged in the master branch:
commit b2f1adf224b2a64c0be046043667f4f89854345b
Merge: 8dc89b3126d80321134311930e3464845db00174 a07f22f4395057aab97c45d0c3f65022410182ea
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon Jun 4 11:47:18 2012 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-boinc/boinc-app-seti
    
    Conflicts:
    	debian/patches/101_freebsd_build.patch


-- 
SETI at home packaging