Manually merged 9e597f6 from master

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 014267a6bbb1b9f060a25f4de8c3b88bc14f0853..4fcf2efeb8be92a2b5881ff99e3250b344b0c029 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1380,8 +1380,17 @@ bool DataCommand::DoExecuteRetrieve()
 
        std::wstringstream file_contents_stream(file_contents);
        std::wstring line;
+       
+       bool firstLine = true;
        while(std::getline(file_contents_stream, line))
-               reply << line << L"\n";
+       {
+               if(firstLine)
+                       firstLine = false;
+               else
+                       reply << "\n";
+
+               reply << line;
+       }
 
        reply << "\r\n";
        SetReplyString(reply.str());