midgetspy/Sick-Beard — comment on commit 05a4cd30ac10dc1ec2bc809afa62947338ef849c
File:  line 0
By midgetspy:

Now that I'm less grumpy I notice that this was actually a merge issue, I'll fix that part.