[SCM] Packaging for teeworlds branch, master, updated. upstream/0.6.0-32-g4e91891

[Felix Geyer]

The following commit has been merged in the master branch:
commit a3591060bee4204da8f37f3c4c36ccf84b0c0084
Merge: b6408caabec337c06bcdfe3725e060353a5c0724 13aef5d62dbbae765dcee6612636b84857791dac
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Thu Aug 4 11:30:20 2011 +0200

    Merge commit 'upstream/0.6.1'
    
    Conflicts:
    	.gitignore


-- 
Packaging for teeworlds