Nico Schottelius 03f99a0e55 Merge branch 'preos' into 4.0-pre-not-stable		2014-02-08 00:32:39 +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
video
web	update link to ungleich	2014-02-06 17:02:14 +01:00
changelog	Merge branch 'preos' into 4.0-pre-not-stable	2014-02-08 00:32:39 +01:00