Nico Schottelius 54fb9e6c3f Merge branch 'master' into install ... Conflicts: lib/cdist/config.py lib/cdist/path.py Merged changes from config.py to config_install.py Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-10-06 16:52:20 +02:00
..
cdist	Merge branch 'master' into install	2011-10-06 16:52:20 +02:00