Steven Armstrong f36d09289d Merge branch 'master' into autorequire ... Conflicts: lib/cdist/test/emulator/__init__.py Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-11-15 10:47:16 +01:00
..
dev	todo++	2011-11-02 17:54:03 +01:00
gfx	add inverted logos for use on white background	2011-06-17 15:01:51 +02:00
man	+/- todo	2011-11-02 16:41:56 +01:00
speeches	import speech from cosin	2011-07-26 17:28:47 +02:00
video	add a video showing a cdist installation in less than 60 seconds	2011-04-19 23:47:26 +02:00
changelog	__cron for 2.0.4	2011-11-03 10:37:10 +01:00