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)
commitbb361b9c8c8455d6eca0b564f051832d439adee2
tree44376f7345e361588591bed206c84c9291aaa106
parentc48b4bf8c497feaf595f419330e6422bfbbba277
parent2cbff34e905028c68bd4309d9d2c6c1950955400
Merge branch 'master' into createPR

Conflicts:
plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java