OSDN Git Service

Merge pull request #1743 from riyad/fix-merging-bugs
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 21 Oct 2012 07:37:13 +0000 (00:37 -0700)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 21 Oct 2012 07:37:13 +0000 (00:37 -0700)
commit5ec1ad8b2375bdce7a820df1be3dc67b18ad2bd0
tree12954f5387748f6e590b917a55058aff63cbc059
parent51ef5b929708d3ad90b6db6afbb78ee24eeb8aa1
parentd4e3664067f330c7d070ee6c92b794cb50ff2d76
Merge pull request #1743 from riyad/fix-merging-bugs

Fix merging bugs