Nico Schottelius 684ad56a80 Merge branch 'master' into notifications ... Took the __file parts from master. Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/conf/type/__file/gencode-local cdist/conf/type/__file/gencode-remote		2013-12-03 14:38:11 +01:00
..
__init__.py	…
local.py	Merge branch 'master' into notifications	2013-12-03 14:38:11 +01:00
remote.py	…