Merge branch 'master' into sp/gfi

git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it.  This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.

This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).

Conflicts:

	git-compat-util.h

fast-import.c

@@ -1927,7 +1927,6 @@ int main(int argc, const char **argv)
 	int i;
 	uintmax_t total_count, duplicate_count;
 
-	setup_ident();
 	git_config(git_default_config);
 
 	for (i = 1; i < argc; i++) {