Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:26:32 +0000 (15:26 +0200)
committerRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:26:32 +0000 (15:26 +0200)
commit7f37035502bbe60fe82d4de222257261a3f859b0
treea4dc506d065565e80677c73f121e7005c3bd821f
parentf88289d7985a04283afff5cdaa81b0cd5449091e
parent4a6967897354a4e80b547c83e71bf162e342a3b4
Merge branch 'master' of linz:/srv/git/git-kairo