Merge branch 'master' into ladders
commit6d282cbd9da37ec2a6ec3bde0b5d2e07d3987a72
authorPetr Baudis <pasky@ucw.cz>
Thu, 19 Jan 2012 01:07:30 +0000 (19 02:07 +0100)
committerPetr Baudis <pasky@ucw.cz>
Thu, 19 Jan 2012 01:07:30 +0000 (19 02:07 +0100)
tree9c676fb821fa8b63526cd0b2c5c6be441af4af56
parentbbaee5132dbf8b7abdab3c4fbee0c8353b7a95dd
parente6c0210bae661594da62738f0c567fcc48883ada
Merge branch 'master' into ladders