Nico Schottelius f89a720cd2 Merge branch 'master' into preos		2014-01-20 08:48:44 +01:00
..
dev	update preos notes	2014-01-11 22:47:34 +01:00
gfx	add logo that is used on cdist flyers	2013-05-15 09:28:41 +02:00
man	describe how to develop multiple features at the same time	2013-12-04 21:25:10 +01:00
speeches	add final version of presentation + pdf variant	2013-11-22 20:57:16 +01:00
video	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00
web	use absolute links	2013-12-24 23:30:33 +01:00
changelog	++changes	2014-01-19 23:29:56 +01:00