Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 28 Mar 2014 09:45:26 +0000 (13:45 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 28 Mar 2014 09:45:26 +0000 (13:45 +0400)

Trivial merge