From: Mark Florisson <eggy.nospam@gmail.com>
Date: Sat, 13 Nov 2010 00:47:58 +0000 (+0100)
Subject: branch merge
X-Git-Tag: 0.14.beta0~1^2~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f208e13c5dddcfcabf1b5e583f62460b84187ca;p=cython.git

branch merge
---

4f208e13c5dddcfcabf1b5e583f62460b84187ca