Merge remote-tracking branch 'origin/jmhack'
commit10bb76cb4988c1b3e7402f3632676e3e046108a5
authorPetr Baudis <pasky@ucw.cz>
Tue, 20 Mar 2012 13:08:25 +0000 (20 14:08 +0100)
committerPetr Baudis <pasky@ucw.cz>
Tue, 20 Mar 2012 13:08:25 +0000 (20 14:08 +0100)
treeb460376f0d387b15086ce88325535b7cfe19d2bc
parentc12c5999d9eaa288878b65ade51c88285e2a1b9e
parent7f635de1e028f764a006f595a0dc5838b4b81664
Merge remote-tracking branch 'origin/jmhack'