From: Mark Florisson <markflorisson88@gmail.com>
Date: Sun, 21 Nov 2010 20:44:12 +0000 (+0100)
Subject: branch merge
X-Git-Tag: 0.14.beta0~1^2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bb725cbc5d2e3e6a110f9a84097c44bcbcad77f;p=cython.git

branch merge
---

6bb725cbc5d2e3e6a110f9a84097c44bcbcad77f