Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 20 Jan 2015 19:12:51 +0000 (20:12 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 20 Jan 2015 19:12:51 +0000 (20:12 +0100)

Trivial merge