Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 24 Mar 2014 12:05:52 +0000 (16:05 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 24 Mar 2014 12:05:52 +0000 (16:05 +0400)

Trivial merge