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)
commit4dda133385cedfe530607b6ac9183eeefd2a7b2a
tree39c54c1a398f007483cbbaf3532e4c2921df4ec2
parent98eef4825770fa75f7397fcd10cdd5c8efaac210
parent4232b21f772fd66c028245cf997373be9ce369f7
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
Documentation/technical/api-trace.txt