From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Wed, 3 Nov 2010 09:36:48 +0000 (-0700)
Subject: merge
X-Git-Tag: 0.14.alpha0~251^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8cac59b1c7087e7a4f0ddf93b12d5798fb0ff45;p=cython.git

merge
---

a8cac59b1c7087e7a4f0ddf93b12d5798fb0ff45
diff --cc Cython/__init__.py
index e10a8f34,782a106f..48e545e6
--- a/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 *