[python-committers] svnmerge to 2.6 branch

[Georg Brandl]

Hi,

since the 2.7 commits now go to release27-maint, I've added svnmerge tracking
from this branch to release26-maint.  From now on, if you want to backport a
commit to 2.6 you have to select the source manually via

svnmerge merge -S /python/trunk -rREV

or

svnmerge merge -S /python/branches/release27-maint -rREV

depending on whether the commit was made before or after the switch to
release27-maint.

Georg

-- 
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.