Merge branch 'master' into falseeye
commitdf37a877dd22ed19bdbbed9f71d375b3e8158b86
authorPetr Baudis <pasky@ucw.cz>
Mon, 16 Jan 2012 13:40:39 +0000 (16 14:40 +0100)
committerPetr Baudis <pasky@ucw.cz>
Mon, 16 Jan 2012 13:40:39 +0000 (16 14:40 +0100)
tree5f0de48f3c6e1534b5a5beac9097c77a96089ab3
parent9d36f00fa3e399d7faca663c013de188a00d830d
parent2762098468017b659b6162df98647af7130c2c71
Merge branch 'master' into falseeye