Merge with git+ssh://sb@repo.or.cz/srv/git/centerim.git