Merge branch 'bc/git-p4-for-python-2.4'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:40:10 +0000 (12:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:40:10 +0000 (12:40 -0800)
With small updates to remove dependency on newer features of
Python, keep git-p4 usable with older Python.

* bc/git-p4-for-python-2.4:
  INSTALL: git-p4 does not support Python 3
  git-p4.py: support Python 2.4
  git-p4.py: support Python 2.5

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge