Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:41:45 +0000 (13:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:41:45 +0000 (13:41 -0700)
* jc/t5516-pushInsteadOf-vs-pushURL:
t5516: test interaction between pushURL and pushInsteadOf correctly

Trivial merge