Merge branch 'master' of linz:/srv/git/git-kairo
drwxr-xr-x - include
drwxr-xr-x - testbed