Merge branch 'maint'
commit1c71541ddd51968ca2957063b00da42941d13d98
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Mar 2013 22:39:43 +0000 (17 15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Mar 2013 22:39:43 +0000 (17 15:39 -0700)
tree8d7033f891dbb1964103488e5b7045e556c2cc84
parentbb79a827a2bd4987b6def75a534635d75478cf4d
parent617cf93182279eec554dda03f44ac6a250e183aa
Merge branch 'maint'

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