Code

Merge branch 'ab/p4' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
commit3ce29f6aff7bb33cd0be75b558e50ff373f995c3
tree5f4a7c96100224122980109834f5b3190920e82c
parent7a3dcd3619f804fd64cc8fa14e7e067d32c631f0
parent9ca85e7aebb1b67a4a82b24209f9b36f561bf8cd
Merge branch 'ab/p4' into pu

* ab/p4:
  git-p4: correct indenting and formatting