Merge branch 'maint'

* maint: t1507: Test that branchname@{upstream} is interpreted as branch

Junio C Hamano committed Mar 17, 2013 at 15:39 UTC 1c71541ddd51968ca2957063b00da42941d13d98

No changes.