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
..
logs	+logfile	2011-03-09 12:01:54 +01:00
todo	Merge branch 'dev' of git://git.d-roth.li/cdist	2011-03-12 19:11:24 +01:00
config.guess
git-post-commit-hook
header	update header	2011-03-08 00:03:20 +01:00
show_all_exported_variables