From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Wed, 29 Dec 2010 11:10:32 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bdafc9e2f47c2d45d5491dc50c1d18c5cfc0290;p=cython.git

Merge remote branch 'upstream/master'
---

7bdafc9e2f47c2d45d5491dc50c1d18c5cfc0290