Nico Schottelius c8dc4181f6 Merge branch 'master' into split_into_modules ... Conflicts: .gitignore Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-09-26 09:36:36 +02:00
..
dev	Merge branch 'master' into split_into_modules	2011-09-26 09:36:36 +02:00
gfx	add inverted logos for use on white background	2011-06-17 15:01:51 +02:00
man	Merge branch 'master' into install	2011-09-23 14:21:01 +02:00
speeches	import speech from cosin	2011-07-26 17:28:47 +02:00
video	add a video showing a cdist installation in less than 60 seconds	2011-04-19 23:47:26 +02:00
changelog	it's not preos, but cdist-preos	2011-09-25 21:10:18 +02:00