From: Maxim Medvedev <maxim.medvedev@jetbrains.com>
Date: Wed, 24 Nov 2010 07:49:38 +0000 (+0300)
Subject: Merge commit 'origin/master'
X-Git-Tag: pycharm/98.438~1^2~17
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=c237c687ca2023e1e36b9e9f6d04c0cf12359cad

Merge commit 'origin/master'
---

c237c687ca2023e1e36b9e9f6d04c0cf12359cad