This branch isn't about updating code

Should we even consider python 2.5 a test target?