Steven Armstrong 405ebbccb7 Merge remote-tracking branch 'telmich/master' ... Conflicts: lib/cdist/emulator.py		2011-10-11 12:40:44 +02:00
..
cdist	Merge remote-tracking branch 'telmich/master'	2011-10-11 12:40:44 +02:00