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
man	Merge branch 'master' into install	2011-09-23 14:21:01 +02:00
speeches
video
changelog	it's not preos, but cdist-preos	2011-09-25 21:10:18 +02:00