Merge: github_merge: less crashes
authorJean Privat <jean@pryen.org>
Wed, 14 May 2014 13:49:10 +0000 (09:49 -0400)
committerJean Privat <jean@pryen.org>
Wed, 14 May 2014 13:49:10 +0000 (09:49 -0400)
commit89b0cdeec8fe6b1abc9b9ec2f3c47723db80e565
tree2deff65c9238ba005ddfcfa937b67b48fa65ceb5
parent5198a29149a17f612a22a753f5284696ff34cb60
parenta6d60718e0ce7bb4898383f343dd85838af39ee0
Merge: github_merge: less crashes

Pull-Request: #460