Merge branch 'bw/submodule-sed-solaris'
commitaf78c317205ce254d9cc75fc0298ee86b579de73
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:50:13 +0000 (20 15:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:50:14 +0000 (20 15:50 -0700)
tree548fe90b56be5aa8e7cf40b9edc06e98f1fdceac
parentbd6f71d1fca865507b3f0a9e310b4d02632cf0ce
parentc5bc42b9b7bfa8dc2e769c4549572265af259d12
Merge branch 'bw/submodule-sed-solaris'

By Ben Walton
* bw/submodule-sed-solaris:
  Avoid bug in Solaris xpg4/sed as used in submodule