Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 30 Oct 2012 08:51:42 +0000 (09:51 +0100)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 30 Oct 2012 08:51:42 +0000 (09:51 +0100)

Trivial merge