Merge branch 'master' of ssh://stefankoegl@repo.or.cz/srv/git/ochimerumaster
commit550956abd0525143951bb5ba8d0771bc824a91e6
authorStefan Koegl <stefan@skoegl.net>
Mon, 22 Mar 2010 15:24:55 +0000 (22 16:24 +0100)
committerStefan Koegl <stefan@skoegl.net>
Mon, 22 Mar 2010 15:24:55 +0000 (22 16:24 +0100)
tree3ec298fbd53cb5c1b74aba4b9f55e891d87fb8f9
parent535460e372b8db103073ac2acc44b71971283814
parenta6ba0bfa81f604f35d9657d5da1bc90590193fac
Merge branch 'master' of ssh://stefankoegl@repo.or.cz/srv/git/ochimeru