Merge branch 'da/p4merge-mktemp-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:05 +0000 (08:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:05 +0000 (08:04 -0800)
* da/p4merge-mktemp-fix:
  p4merge: fix printf usage


Trivial merge