small-jeeper/Terasology — comment on commit 27a5b5ed79002ee97246d98d563e4592c47f4eb7
File:  line 0
By small-jeeper:

Damn... Guys, I was in a 4-days business trip in Japan. I didn't have enough time to make the pull request (some conflicts came up during the rebase, but I had no time to fix them because I had to get on board of the plane). I'm sorry, Benjamin, for you had to do the merge manually. Now I'll make the fetch and see what I should do next.