Merge remote branch 'origin/master' into ladders
commit1f7e956d1dadc376a396a717d666034649792da7
authorPetr Baudis <pasky@ucw.cz>
Sun, 11 Mar 2012 18:35:28 +0000 (11 19:35 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sun, 11 Mar 2012 18:35:28 +0000 (11 19:35 +0100)
treee91e834fd83020a96b0af5444ce6d910895334e7
parent4abff4cffe6bdabcbe0a5454ac34dbd3b2049048
parentbdb48af17b58594ff6babd71e93b3ba1b37311a6
Merge remote branch 'origin/master' into ladders