Merge branch 'master' of ssh://pasky@repo.or.cz/srv/git/girocco into rorcz
commitfefa08584cc6b805740bc5197f0efe2fb7648443
authorPetr Baudis <pasky@ucw.cz>
Fri, 22 Jan 2010 17:38:08 +0000 (22 18:38 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Fri, 22 Jan 2010 17:38:08 +0000 (22 18:38 +0100)
tree277e27b26d782ab0094caa25e787304f131ba453
parent987982a94af894778aa1ef7e40fc819bd38e64d8
parent639066c36161ca8242910f7ee5bcbde527ee1b09
Merge branch 'master' of ssh://pasky@repo.or.cz/srv/git/girocco into rorcz