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
man
speeches	add tex sources of first two cdist specches	2011-04-28 19:04:44 +02:00
video
changelog	Merge remote-tracking branch 'sans/master'	2011-04-29 10:39:52 +02:00