Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 2 Dec 2014 15:40:12 +0000 (16:40 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 2 Dec 2014 15:40:12 +0000 (16:40 +0100)

Trivial merge