Nico Schottelius 8bd52b9065 Merge branch 'executionorder' ... Conflicts: doc/dev/todo/TAKEME Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-03-29 16:37:39 +02:00
..
dev	Merge branch 'executionorder'	2011-03-29 16:37:39 +02:00
gfx	+text versions of the logo	2011-03-18 02:28:47 +01:00
man	-FIXME in doc/man/cdist-stages.text	2011-03-29 16:24:13 +02:00
changelog	more interesting stuff for 1.5.0	2011-03-27 23:33:27 +02:00