Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md
This commit is contained in:
Sytse Sijbrandij 2012-09-02 18:41:33 +02:00
commit 0c59904715

Diff content is not available