Steven Armstrong 1668620b5b Merge remote-tracking branch 'telmich/master' ... Conflicts: doc/dev/todo/steven Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-10-07 12:52:07 +02:00
..
dev	Merge remote-tracking branch 'telmich/master'	2011-10-07 12:52:07 +02:00
gfx	add inverted logos for use on white background	2011-06-17 15:01:51 +02:00
man	remove more obsolete manpages	2011-10-06 16:42:45 +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	introduce unclear changes (names not yet decided)	2011-10-06 16:49:27 +02:00