cdist/docs
Nico Schottelius 79973d1582 Merge branch 'master' into install_integration
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
2014-02-08 00:32:28 +01:00
..
dev
gfx
man update reference 2014-02-08 00:14:42 +01:00
speeches
video
web update link to ungleich 2014-02-06 17:02:14 +01:00
changelog cdist 3.0.7 2014-02-08 00:13:33 +01:00