Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Sun, 16 May 2010 22:05:04 +0000 (00:05 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 16 May 2010 22:05:04 +0000 (00:05 +0200)
commit69305203a131f89f9d48b54144e55670356347b9
tree2bf2d9f78344d22a5d9a36293bf9adf2d7035da6
parentc1666e91613b658a3711a51fa367a0d11e677fd2
parent9c17eb15dcf9ffb7a08f50f34789757012d79b9e
Merge branch 'master' of linz:/srv/git/git-kairo