From f18b2b5960dab51ff30a01dc3c0cd1ddb1893cd4 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Tue, 23 Jul 2013 18:42:44 +0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master'