From: Ilya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Date: Tue, 7 Oct 2014 19:42:01 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: phpstorm/140.15^0
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=2a548c847f05f329a3db7e9dd0fcc25473835dfe

Merge remote-tracking branch 'origin/master'
---

2a548c847f05f329a3db7e9dd0fcc25473835dfe