JC Brand 1dff3ac002 Merge branch '0.8' ...

Conflicts:
	CONTRIBUTING.rst
	Makefile
	README.rst
	bower.json
	docs/CHANGES.rst
	docs/doctrees/index.doctree
	docs/html/_sources/index.txt
	docs/html/index.html
	docs/html/searchindex.js
	docs/source/index.rst

2014-04-19 07:05:00 +02:00

216 KiB

Raw History

View Raw