Merge branch 'maint'

* maint:
Start preparing for 1.5.3.6
git-send-email: Change the prompt for the subject of the initial message.
SubmittingPatches: improve the 'Patch:' section of the checklist
instaweb: Minor cleanups and fixes for potential problems
stop t1400 hiding errors in tests
Makefile: add missing dependency on wt-status.h
refresh_index_quietly(): express "optional" nature of index writing better
Fix sed string regex escaping in module_name.
Avoid a few unportable, needlessly nested "...`...".
git-mailsplit: with maildirs not only process cur/, but also new/

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Makefile
index 0d5590f6cfdd3d6c567eff9d38322071fbba4b9e,2331e45adfb09c7327d5868f536bc5d413d8af95..621270f6235306dcdd9c55ac371c90cb5b5effc3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -920,8 -891,10 +920,9 @@@ git-http-push$X: revision.o http.o http
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 -$(LIB_OBJS) $(BUILTIN_OBJS) fetch.o: $(LIB_H)
 +$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
  $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
 -$(DIFF_OBJS): diffcore.h
+ builtin-revert.o builtin-runstatus.o wt-status.o: wt-status.h
  
  $(LIB_FILE): $(LIB_OBJS)
        $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)

diff --cc builtin-mailsplit.c
Simple merge

diff --cc git-instaweb.sh
Simple merge

diff --cc git-rebase--interactive.sh
Simple merge

diff --cc git-send-email.perl
Simple merge

diff --cc git-submodule.sh
Simple merge