Ingo Schommer 04ae1abe65 Merge remote-tracking branch 'mandrew/master'
Conflicts:
	docs/en/misc/contributing.md
2011-03-09 17:17:10 +13:00
..