From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sat, 15 Jan 2011 19:53:25 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4242799cb5b41ec82ad868e5fb11f7f29f6b9546;p=cython.git

Merge remote branch 'upstream/master'
---

4242799cb5b41ec82ad868e5fb11f7f29f6b9546