From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sat, 28 Jan 2012 14:35:34 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: cidr/112.629~4
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=176fb90b1ed47abcdfe44cf3dcb8487131c1c752

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

176fb90b1ed47abcdfe44cf3dcb8487131c1c752