From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Fri, 1 Apr 2011 14:49:37 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17da082e92ef50340f1c1d00ad08b59bf8597c05;p=cython.git

Merge remote branch 'upstream/master'
---

17da082e92ef50340f1c1d00ad08b59bf8597c05