Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 9 Oct 2014 17:01:03 +0000 (19:01 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 9 Oct 2014 17:01:03 +0000 (19:01 +0200)

Trivial merge