Merge branch 'maint'

* maint:
finish_connect(): thinkofix
git-mv: succeed even if source is a prefix of destination
Solaris does not support C99 format strings before version 10

diff --cc Makefile
Simple merge