cdist-backup/cdist/exec
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 lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
local.py Merge branch 'master' into notifications 2013-12-03 14:38:11 +01:00
remote.py Merge branch 'enhance_cache' 2013-08-28 15:43:03 +02:00