Nico Schottelius 8216ec88e4 Merge branch 'master' into 4.0-pre-not-stable ... Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: docs/changelog		2014-01-24 01:20:12 +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	Shell selection support via ENV	2014-01-20 20:30:37 +01:00
speeches	add final version of presentation + pdf variant	2013-11-22 20:57:16 +01:00
video
web	use absolute links	2013-12-24 23:30:33 +01:00
changelog	Merge branch 'master' into 4.0-pre-not-stable	2014-01-24 01:20:12 +01:00