red/red — pull request #694 by IngoHohmann (2014-02-24 15:20:48+00:00)
Title: resolve merge conflict

Somehow, my rebase seems not to have worked smoothly, so I created a new branch, and copied the file over.

As far as I can see, this should merge now flawlessly,

Should I close the older pull request?