fix merge conflict
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 4 Jan 2013 06:29:34 +0000 (07:29 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 4 Jan 2013 06:29:34 +0000 (07:29 +0100)
commit51f3877ee1c4919f3cd570812aef884d913328bb
treea03f24924ef2091ea3b91b7ec3ff113e96e05468
parent81a1f7fdc4355cc3ae328dc45a8907a061fb7764
fix merge conflict
Cython/__init__.py