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	Merge branch 'master' into install_integration	2014-01-21 17:17:20 +01:00
gfx	add scaled version of the cdist logo	2014-01-20 10:11:23 +01:00
man	update reference	2014-02-08 00:14:42 +01:00
speeches	add final version of presentation + pdf variant	2013-11-22 20:57:16 +01:00
video	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00
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