Nico Schottelius 2b380b7dc1 Merge branch 'master' into feature_init_process ... Conflicts: doc/changelog doc/dev/todo/niconext doc/man/cdist-reference.text.sh lib/cdist/core/explorer.py doc/man/cdist-reference.text.sh documents better reachability of variables - also suitable for master? Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>		2012-02-14 13:53:16 +01:00
..
man1
man7
cdist-reference.text.sh