Merge branch 'da/p4merge-mktemp-fix'

* da/p4merge-mktemp-fix: p4merge: fix printf usage

Junio C Hamano committed Feb 14, 2013 at 16:05 UTC c0acef9b8ae84e7f67a1c231eb97ecfd897c5651

No changes.