Merge branch 'ta/config-set'

* ta/config-set: t1308: fix broken here document in test script

Junio C Hamano committed Oct 20, 2014 at 12:23 UTC 713ee7fe46dce859e46dbb255498ff79cdfb7fba

No changes.