Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Sat, 3 Jan 2015 12:54:43 +0000 (13:54 +0100)
committerRobert Kaiser <kairo@kairo.at>
Sat, 3 Jan 2015 12:54:43 +0000 (13:54 +0100)

Trivial merge