Nico Schottelius 0a3b5d33d9 Merge branch 'master' into 4.0-pre-not-stable		2014-01-22 00:45: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
video
web
changelog	Merge branch 'master' into 4.0-pre-not-stable	2014-01-22 00:45:12 +01:00