Merge remote-tracking branch 'origin/master' appcode/140.2679
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 23 Feb 2015 12:25:15 +0000 (13:25 +0100)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 23 Feb 2015 12:25:15 +0000 (13:25 +0100)

Trivial merge