resolved merge conflict between svn and github, the only way was to allow the conflict to affect the file for some commits. This commit reverts the file back to the desired state.
Merge pull request #13 from oostenveld/bug1967-mergeconflict

resolved merge conflict between svn and github