cdist/doc
Nico Schottelius 02a2d39ebf Merge branch 'master' into changerunningorder
Conflicts:
	bin/cdist-deploy-to

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:02:12 +02:00
..
dev Merge branch 'master' into changerunningorder 2011-03-28 15:02:12 +02:00
gfx +text versions of the logo 2011-03-18 02:28:47 +01:00
man Merge branch 'master' into changerunningorder 2011-03-28 15:02:12 +02:00
changelog more interesting stuff for 1.5.0 2011-03-27 23:33:27 +02:00