Nico Schottelius bfb43079e3 Merge branch 'dev' of git://git.d-roth.li/cdist ... Conflicts: conf/manifest/init Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-03-12 19:11:24 +01:00
..
daninext	todos /dani updated	2011-03-08 19:50:02 +01:00
niconext	[TODO] update lists	2011-03-11 19:15:28 +01:00
post-1.0	Merge branch 'dev' of git://git.d-roth.li/cdist	2011-03-12 19:11:24 +01:00
post-1.0-cache	cleanup old internal documentation	2011-02-23 13:49:29 +01:00