rename back ;)
Merge branch 'master' of github.com:peers/peerkit-server