Merge branch 'master' of git+ssh://github.com/cython/cython
authorStefan Behnel <stb@skoobe.de>
Sun, 14 Jul 2013 11:48:00 +0000 (13:48 +0200)
committerStefan Behnel <stb@skoobe.de>
Sun, 14 Jul 2013 11:48:00 +0000 (13:48 +0200)

Trivial merge