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
..
cdist-config.text
cdist-quickstart.text
cdist-terms.text
cdist-type-addifnosuchline.text	Implementation of addifnosuchline type	2011-03-08 19:51:47 +01:00
cdist-type-manifest.text