From: Kirill Likhodedov <kirill.likhodedov@jetbrains.com>
Date: Tue, 20 Jul 2010 14:23:32 +0000 (+0400)
Subject: Merge branch 'master' of git.labs.intellij.net:idea/community
X-Git-Tag: idea/96.707~6^2^2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=4196c7fd590c0aeecd350d431f45bf423937b169

Merge branch 'master' of git.labs.intellij.net:idea/community
---

4196c7fd590c0aeecd350d431f45bf423937b169