Merge branches 'master' and 'preproc-paste-fix'
commitfed61a547f9c370223a6502200ff2c95373aa312
authorCyrill Gorcunov <gorcunov@gmail.com>
Tue, 13 Jul 2010 17:16:05 +0000 (13 21:16 +0400)
committerCyrill Gorcunov <gorcunov@gmail.com>
Tue, 13 Jul 2010 17:16:05 +0000 (13 21:16 +0400)
tree2126314ebc60a3d81e3d6c5b39746abf6f3bcf32
parentdc2152ed0a3a889fff90a100f32522325c0dc369
parent984279b1dde9db0cc8bb27d812cd3ad98ca34162
Merge branches 'master' and 'preproc-paste-fix'