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
..
dev	Merge branch 'dev' of git://git.d-roth.li/cdist	2011-03-12 19:11:24 +01:00
man	Merge branch 'dev' of git://git.d-roth.li/cdist	2011-03-12 19:11:24 +01:00
changelog	update changelog	2011-03-12 18:48:02 +01:00