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)
commit5eb830da522414075b559eae1929f1946f11ea48
tree267c54101c5b3939b704257bd5b9b7de30956703
parentbb9f2310653c2518525b3621201b076895298171
parent1486b1d9436a872c9658b78d534b7c1c8ce71f63
Merge branch 'master' of linz:/srv/git/git-kairo