Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Sat, 15 Jan 2011 10:44:36 +0000 (13:44 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Sat, 15 Jan 2011 10:44:36 +0000 (13:44 +0300)
Conflicts:
runtests.py

1  2 
Cython/Compiler/ParseTreeTransforms.py