Merge branch 'master' into console_with_placeholders
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 23 Mar 2015 16:01:36 +0000 (19:01 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 23 Mar 2015 16:01:36 +0000 (19:01 +0300)
commit5937aeb38b67d4a48a6b27af28bac06ab127da1f
tree7f57d5fe25f11612f3c24c7877616a57baaaa8fd
parente2eb3bbb2276bf6c74f937fc3c3fd971bac8dbef
parentfd872d258e73a2bffdc4e54c1861adaa4bd2b4a3
Merge branch 'master' into console_with_placeholders