Nico Schottelius 1da7436fcb Merge branch 'install' ... Conflicts: lib/cdist/config.py Some problems left. Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-10-06 17:06:56 +02:00
..
cdist	Merge branch 'install'	2011-10-06 17:06:56 +02:00