Merge remote-tracking branch 'origin/master' into loki/newlog
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 9 Sep 2013 11:50:09 +0000 (15:50 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 9 Sep 2013 11:50:09 +0000 (15:50 +0400)
Conflicts:
platform/platform-resources-en/src/misc/registry.properties
plugins/github/github.iml
plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java

1  2 
.idea/modules.xml
platform/platform-resources-en/src/misc/registry.properties
plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesLogPanel.java
resources/src/idea/RichPlatformPlugin.xml

Simple merge