Merge branch 'master' of ssh://repo.or.cz/srv/git/ctl24master
commitc6753df7aff30cf314f585e62dc16f16c2f216c2
authorxaoe <xaoe@boese-ban.de>
Sun, 13 Dec 2009 18:53:25 +0000 (13 19:53 +0100)
committerxaoe <xaoe@boese-ban.de>
Sun, 13 Dec 2009 18:53:25 +0000 (13 19:53 +0100)
tree992e9d316e5a645bc84748280d90184a43a9b2f2
parent7119d61bcbfaf74a868dd01730d1243bda572a6e
parent61cc69ac459c1d8a875494db3378417531530790
Merge branch 'master' of ssh://repo.or.cz/srv/git/ctl24