Merge branch 'master' of Fernflower
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 28 Aug 2014 15:42:52 +0000 (19:42 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 28 Aug 2014 15:42:52 +0000 (19:42 +0400)

Trivial merge