Merge branch 'loki/newlog'
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 19 Sep 2013 15:07:24 +0000 (19:07 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 19 Sep 2013 15:07:24 +0000 (19:07 +0400)
commitf0ae24e79581a55ef8538b3ff9e355b1f58c67b5
treef038cde12a2229b2de883fba8d9519e23f1c9af0
parent476dac410d2102250c4d0c8c90f420e900174f02
parenta5a3a2f826056ce021d7ad368f979ca3216e5329
Merge branch 'loki/newlog'

Conflicts:
platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java
platform/dvcs/dvcs.iml
platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
plugins/git4idea/src/META-INF/plugin.xml
resources/src/idea/RichPlatformPlugin.xml