Steven Armstrong 59e774b08d fix merge conflict in changelog ... Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-03-16 14:41:43 +01:00
..
dev	take care of solaris in next version	2011-03-16 11:36:45 +01:00
man	cdist-env: document ./ as default	2011-03-16 10:25:53 +01:00
changelog	fix merge conflict in changelog	2011-03-16 14:41:43 +01:00