Nico Schottelius 9a3d9334d5 Merge branch 'master' into install ... Conflicts: bin/cdist-config Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-09-19 15:05:39 +02:00
..
dev	Merge branch 'master' into install	2011-09-19 15:05:39 +02:00
gfx
man	Merge branch 'master' into install	2011-09-19 15:05:39 +02:00
speeches	import speech from cosin	2011-07-26 17:28:47 +02:00
video
changelog	changes for 2.0.1	2011-09-18 20:57:13 +02:00