Merge remote-tracking branch 'origin/master' into loki/newlog
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 22 Aug 2013 13:35:07 +0000 (17:35 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 22 Aug 2013 13:35:07 +0000 (17:35 +0400)
commit86bab1860d7cbd09cd00dcf8dc792e3379ffac31
tree100365e881bea527c66b04bb60ce7a9b661eeeb0
parent0434bf6f8f766bc9ac6eaab9eaec4319c8fe9dec
parent2bb8b9c046c1ea279eb3d51227d2451c6e5c1d86
Merge remote-tracking branch 'origin/master' into loki/newlog

Conflicts:
.idea/modules.xml
platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
.idea/modules.xml
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
plugins/git4idea/git4idea.iml
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/GitVcs.java