Merge branch 'jc/utf8'

* jc/utf8:
  t3900: test conversion to non UTF-8 as well
  Rename t3900 test vector file
  UTF-8: introduce i18n.logoutputencoding.
  Teach log family --encoding
  i18n.logToUTF8: convert commit log message to UTF-8
  Move encoding conversion routine out of mailinfo to utf8.c

Conflicts:

	commit.c

diff --cc Documentation/config.txt
Simple merge

diff --cc commit.c
index 59ea77c577886a3ba5b4ef385099d7a564af173c,6f2839a5cd3708fca9ef845375d3b16373fd3266..eb06afbbe0f00ac4f553e37c50eca290418a7907
--- 1/commit.c
--- 2/commit.c
+++ b/commit.c
@@@ -1,7 -1,7 +1,8 @@@
  #include "cache.h"
  #include "tag.h"
  #include "commit.h"
 +#include "pkt-line.h"
+ #include "utf8.h"
  
  int save_commit_buffer = 1;