Nico Schottelius 5389d71905 Merge branch 'master' into 4.0-pre-not-stable ... Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/config.py cdist/emulator.py docs/changelog		2014-02-05 23:22:04 +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	setting up CDIST_ALLOW_OVERRIDE to any value is ok - do not depend on true/yes/ja	2014-02-05 21:09:24 +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	use absolute links	2013-12-24 23:30:33 +01:00
changelog	Merge branch 'master' into 4.0-pre-not-stable	2014-02-05 23:22:04 +01:00