Merge branch 'master' into createPR
authorAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Thu, 10 Oct 2013 12:25:14 +0000 (16:25 +0400)
committerAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Thu, 10 Oct 2013 12:25:14 +0000 (16:25 +0400)
Conflicts:
plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java


Trivial merge