gajim: Merged default branch with plugin-system branch. Not all ...