seba--/sugarj — pull request #34 by yfcai (2012-10-02 15:01:44+00:00)
Title: Merge conflicting pull requests

I issued 2 pull requests with different changes on the same file SDFCommands.java. Instead of merging, they overwrote each other.

This is the result of combining the pulls SDFCommands and SDFCommands-timeout.