Merge branch 'master' of git://repo.or.cz/luxor
commit9c6254e4079d11afbdad18d664ba369d6de05934
authoropsi <opsi@ka-tet.(none)>
Mon, 19 May 2008 17:39:37 +0000 (19 19:39 +0200)
committeropsi <opsi@ka-tet.(none)>
Mon, 19 May 2008 17:39:37 +0000 (19 19:39 +0200)
tree9316c26671a7c1ce82911e1850fdf601b442752c
parent5091466b2c25ebcbedf48db779feed3da8f42878
parent6893985da0e7041195672f0d5c4e91cd01bf5376
Merge branch 'master' of git://repo.or.cz/luxor