cgeo/c-geo-opensource — comment on commit 51330d3d720745585d8bc1d5abf5d821c63c1011
File:  line 0
By SammysHP:

Is this really the solution for the merge-problem?