Merge branch 'master' of http://ryoko.camperquake.de/GIT/videosite