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

Trivial merge