LimeSurvey/LimeSurvey — comment on commit a54baec19ce68734fe4e878873e8b560234e2d06
File:  line 0
By c-schmitz:

This should fix the merge history