Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 7 Mar 2014 10:05:35 +0000 (14:05 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 7 Mar 2014 10:05:35 +0000 (14:05 +0400)

Trivial merge