Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Fri, 30 Jan 2015 12:03:06 +0000 (13:03 +0100)
committerKonstantin Bulenkov <kb@jetbrains.com>
Fri, 30 Jan 2015 12:03:06 +0000 (13:03 +0100)

Trivial merge