Merge branch 'master' of http://git.netshadow.at/phpfspot