Nico Schottelius efe8dbfa85 Merge remote-tracking branch 'steven/oo-restructure' ... Conflicts: lib/cdist/config.py lib/cdist/path.py Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-10-06 16:57:48 +02:00
..
cdist	Merge remote-tracking branch 'steven/oo-restructure'	2011-10-06 16:57:48 +02:00