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

Merge remote branch 'upstream/master'
---

2eb1156a6359f900fa9e01e69d1139e332e380f1