Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 15 Dec 2014 19:04:26 +0000 (20:04 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 15 Dec 2014 19:04:26 +0000 (20:04 +0100)

Trivial merge