Merge remote-tracking branch 'origin/master' idea/134.733
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 17 Jan 2014 08:47:22 +0000 (12:47 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 17 Jan 2014 08:47:22 +0000 (12:47 +0400)

Trivial merge