Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Sat, 5 Sep 2015 02:21:00 +0000 (04:21 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sat, 5 Sep 2015 02:21:00 +0000 (04:21 +0200)

Trivial merge