Steven Armstrong b8b9719cc6 Merge remote-tracking branch 'telmich/master' ... Conflicts: lib/cdist/core/explorer.py lib/cdist/emulator.py Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-10-15 10:51:08 +02:00
..
cdist	Merge remote-tracking branch 'telmich/master'	2011-10-15 10:51:08 +02:00