Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 18 Mar 2014 12:07:23 +0000 (16:07 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 18 Mar 2014 12:07:23 +0000 (16:07 +0400)

Trivial merge