Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 3 Dec 2014 10:12:39 +0000 (11:12 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 3 Dec 2014 10:12:39 +0000 (11:12 +0100)

Trivial merge