Nico Schottelius f290b94d7b Merge branch 'master' into feature_init_process ... Conflicts: doc/changelog Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>		2012-01-20 11:40:09 +01:00
..
dev	Merge branch 'master' into feature_init_process	2012-01-20 11:40:09 +01:00
gfx
man	Merge branch 'master' into feature_init_process	2012-01-20 11:40:09 +01:00
speeches
video
changelog	Merge branch 'master' into feature_init_process	2012-01-20 11:40:09 +01:00