Merge branch 'da/p4merge-mktemp-fix' into maint

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

Junio C Hamano committed Feb 25, 2013 at 08:04 UTC 92f561d7f0f249d7f15cddce1d438d229e689e87

No changes.