XeTK/JavaBot — pull request #129 by ODyckhoff (2014-08-08 11:50:40+00:00)
Title: removed merge conflict text

>.>