Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 10 Oct 2013 16:53:22 +0000 (20:53 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 10 Oct 2013 16:53:22 +0000 (20:53 +0400)

Trivial merge