Merge branch 'master' of git+ssh://repo.or.cz/srv/git/girocco
commit239050b67a0c91dab7ebb594787e7ce4f225a81a
authorPetr Baudis <pasky@ucw.cz>
Wed, 10 Feb 2010 15:19:44 +0000 (10 16:19 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Wed, 10 Feb 2010 15:19:44 +0000 (10 16:19 +0100)
tree1b3845ae9045fd6d0d9bff82cc165ddf95f93d9a
parent157ba1896bfc17fbd6fedaf3c2d5c4c9f45540ab
parent67f39635aa4a63f77586a52fccae9ff96ea93644
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/girocco