Merge branch 'master' into feature_init_process

Conflicts:
	doc/man/cdist-reference.text.sh

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-02-14 13:56:29 +01:00
commit 18eaa476e4