Merge branch 'ep/trace-doc-sample-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 21:16:00 +0000 (14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 21:16:00 +0000 (14:16 -0700)
Fix a typo in an example in the trace API documentation.

* ep/trace-doc-sample-fix:
api-trace.txt: fix typo

1  2 
Documentation/technical/api-trace.txt
Simple merge