That wasn't quite right.
Merge branch 'master' of gate.dyna.ping.de:/git/tins