Merge pull request #142 from mongi3/master

Added "--capi-reexport-cincludes" option

diff --cc Cython/Compiler/CmdLine.py
index 65fba1d,574f892..e8a8e4e
--- 1/Cython/Compiler/CmdLine.py
--- 2/Cython/Compiler/CmdLine.py
+++ b/Cython/Compiler/CmdLine.py
@@@ -36,8 -37,9 +36,9 @@@ Options
    --embed[=<method_name>]        Generate a main() function that embeds the Python interpreter.
    -2                             Compile based on Python-2 syntax and code semantics.
    -3                             Compile based on Python-3 syntax and code semantics.
+   --capi-reexport-cincludes      Add cincluded headers to any auto-generated header files.
    --fast-fail                    Abort the compilation on the first error
 -  --warning-error, -Werror       Make all warnings into errors
 +  --warning-errors, -Werror      Make all warnings into errors
    --warning-extra, -Wextra       Enable extra warnings
    -X, --directive <name>=<value>[,<name=value,...] Overrides a compiler directive
  """

diff --cc Cython/Compiler/Main.py
Simple merge

diff --cc Cython/Compiler/ModuleNode.py
Simple merge