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
..
dev	mark same algorithmus for deps in logs	2012-02-14 11:15:02 +01:00
gfx
man	Merge branch 'master' into feature_init_process	2012-02-14 13:53:16 +01:00
speeches	import speech from cosin	2011-07-26 17:28:47 +02:00
video
changelog	do not setup __debug - let the user do if required - do not interfere type with core	2012-02-13 16:27:41 +01:00