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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 70ca03b4c466379591d8106f263e893c3fbbdac7
Merge: 006e3358d82228e968d7c1009e620b83b86344fb c0a111ba3d3f8504d8b2eddd445bd175626b36ef
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue May 29 23:50:40 2012 +0200

    Merge tag 'upstream/6.12_svn1306'
    
    Upstream version 6.12~svn1306
    
    Conflicts:
    	sah_config.h


-- 
SETI at home packaging