Nico Schottelius 1480cafac5 Merge remote-tracking branch 'sans/master' ... Conflicts: doc/changelog Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-04-29 10:39:52 +02:00
..
dev	++todo	2011-04-29 10:38:47 +02:00
gfx	+text versions of the logo	2011-03-18 02:28:47 +01:00
man	seperate branches for more than one feature, please	2011-04-18 08:35:52 +02:00
speeches	add tex sources of first two cdist specches	2011-04-28 19:04:44 +02:00
video	add a video showing a cdist installation in less than 60 seconds	2011-04-19 23:47:26 +02:00
changelog	Merge remote-tracking branch 'sans/master'	2011-04-29 10:39:52 +02:00