Merge branch 'elieux-master'

src/OutputFile.h

@@ -40,6 +40,9 @@
 #include <cstdlib>
 #include <cstdarg>
 
+// include <string> just to cancel libintl's #define vprintf libintl_vprintf
+#include <string>
+
 namespace aria2 {
 
 class OutputFile {