Nico Schottelius 3140c009d3 Merge branch 'master' into 2.1		2012-09-21 11:09:26 +02:00
..
dev	+old bug	2012-09-20 17:48:54 +02:00
gfx	add logo with subtitle	2012-06-06 15:18:02 +02:00
man	Merge branch 'feature_multiple_arguments' of https://github.com/asteven/cdist	2012-06-05 18:27:52 +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	++changes(2.0.15)	2012-09-20 17:44:24 +02:00
changelog-2.1	+changelog for 2.1	2012-09-20 17:47:40 +02:00