Correct git conflict information in fog.upload.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2201 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master