From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Thu, 20 Jan 2011 16:06:39 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56e2c80a2c410c83a1805172937ea2850bc7f1f4;p=cython.git

Merge remote branch 'upstream/master'
---

56e2c80a2c410c83a1805172937ea2850bc7f1f4