Steven Armstrong b9b90dad36 merge from upstream ... Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-04-04 13:18:04 +02:00
..
dev	todo for 1.6	2011-04-04 09:45:52 +02:00
gfx	+text versions of the logo	2011-03-18 02:28:47 +01:00
man	merge from upstream	2011-04-04 13:18:04 +02:00
changelog	+changes	2011-04-04 11:07:15 +02:00