Merge branch 'master' into patterns
commit93855942d132cab278f35992bc1a06515f669da0
authorPetr Baudis <pasky@ucw.cz>
Sat, 7 Jan 2012 17:45:42 +0000 (7 18:45 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sat, 7 Jan 2012 17:45:42 +0000 (7 18:45 +0100)
treeda3d31bdffac342fd688a6f97b8001dd05518894
parent98e0b37d96f2ecdd147929858078af9127a44b8f
parent4f82a0b3c3cd71f682a5c447638672f53851f923
Merge branch 'master' into patterns