From: Ilya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Date: Fri, 28 Nov 2014 15:00:37 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into test2
X-Git-Tag: clion/140.813~2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=b30e043a14e254861b423a48356f3fe561ffc1cf

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

b30e043a14e254861b423a48356f3fe561ffc1cf