merge

diff --cc Cython/__init__.py
index e10a8f34fddd078c37cb33e73913d74ef230ef40,782a106fc131afce63ef25e5af9f575cc5430e43..48e545e68e1519a832fe0989ed003c09db1903a4
--- 1/Cython/__init__.py
--- 2/Cython/__init__.py
+++ b/Cython/__init__.py
@@@ -1,4 -1,4 +1,4 @@@
- from Cython.Compiler.Version import version as __version__ 
 -__version__ = '0.13'
++__version__ = "0.13"
  
  # Void cython.* directives (for case insensitive operating systems). 
  from Cython.Shadow import *