Commit graph

1 commit

Author SHA1 Message Date
Karl Hobley
f4b746e3f5 Merge branch 'master' into multilingual-tutorial
Conflicts:
	docs/index.rst
2014-08-26 11:57:52 +01:00