Conflicts:
	CHANGES.rst

gcc older than 4.7. This fixes a recurring Travis build failure.

Use c++0x rather than c++11 for unique_ptr tests

gcc older than 4.7. This fixes a recurring Travis build failure.

typo in buffer protocol docs

respect tristate return values from isinf() functions instead of shadowing them in a "bint" declaration

Add <memory> header to libcpp

* shape calculation was off
* flag macros live in cpython, not cython

[ci skip]