Merge branch 'ep/trace-doc-sample-fix' into maint

Fix a typo in an example in the trace API documentation. * ep/trace-doc-sample-fix: api-trace.txt: fix typo

Junio C Hamano committed Apr 29, 2016 at 14:16 UTC 4dda133385cedfe530607b6ac9183eeefd2a7b2a

No changes.