Merge branch 'maint'

By Jens Lehmann (1) and Johannes Sixt (1) * maint: Consistently use "superproject" instead of "supermodule" t3404: begin "exchange commits with -p" test with correct preconditions

Junio C Hamano committed May 20, 2012 at 15:45 UTC adc7052bb6e737cec0c6702f8dde259540eab672

No changes.