Merge branch 'master' of plugins/typeMigration
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 20 Jun 2014 10:25:22 +0000 (12:25 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 20 Jun 2014 10:25:22 +0000 (12:25 +0200)

Trivial merge