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
gfx
man
speeches
video
changelog	__cron for 2.0.4	2011-11-03 10:37:10 +01:00