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)
commit4eb45bd45fc0af3f677ad8a7e3f10cf25bdc2929
tree85276e2298b1a5c317fa0c7b9024d1ce31201d85
parent1c06e73066c41a305e16f26c7577cac928fe33d8
parent55fef093d1027a06f8047e45148d71b48bb6b7d2
Merge branch 'master' of linz:/srv/git/git-kairo