Nico Schottelius 1be3ea4362 Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist		2014-02-06 16:32:29 +01:00
..
dev	add log from today	2014-01-20 16:19:41 +01:00
gfx
man	Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist	2014-02-06 16:32:29 +01:00
speeches
video
web
changelog	++changes	2014-02-06 15:58:25 +01:00