From: Ilya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Date: Thu, 9 Apr 2015 21:52:58 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: dbe/142.1035~2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=60c8679af1c699c0962cd3461bd3fb30561e732f

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

60c8679af1c699c0962cd3461bd3fb30561e732f