Merge branch 'master' into ladders
commita1e5017ba52059cf3b7d065da976d4e01e23b814
authorPetr Baudis <pasky@ucw.cz>
Sun, 20 Feb 2011 22:36:46 +0000 (20 23:36 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sun, 20 Feb 2011 22:36:46 +0000 (20 23:36 +0100)
tree1b7e75cff3fb8a07632222acb54aa85a0670b3b2
parent0f55030479f1abb26088580950ed7b28a7d8e1df
parentff469f67efeaa3dca8914b802e15c0e250f20ecb
Merge branch 'master' into ladders