Steven Armstrong 8ac375e8a6 Merge branch 'master' into autorequire ... Conflicts: lib/cdist/test/emulator/__init__.py Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-11-17 13:08:30 +01:00
..
conf	Merge branch 'master' into autorequire	2011-11-17 13:08:30 +01:00