MartinVanBuren/MTR-Java — pull request #4 by dannye (2014-06-17 14:22:31+00:00)
Title: Properly resolve merge conflict

A conflict was committed before being resolved in https://github.com/MartinVanBuren/MTR-Java/commit/9f8aa5c437f7ab10c84f809b3cc6ecc24c3336b8