From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Fri, 8 Apr 2011 00:24:19 +0000 (-0700)
Subject: Merge remote branch 'remotes/fransesc/compiler_directives'
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=95d13537adbae2b2e3357ebd639cd912162f7fe9;p=cython.git

Merge remote branch 'remotes/fransesc/compiler_directives'

Conflicts:
	docs/src/reference/compilation.rst
---

95d13537adbae2b2e3357ebd639cd912162f7fe9