Merge branch 'master' into preos

cdist/conf/type/__line/gencode-remote

@@ -58,7 +58,7 @@ case "$state_should" in
 
         # Only replace ' with '"'"' and keep \ as they are
         line_sanitised=$(cat "$__object/parameter/line" | sed -e "s/'/'\"'\"'/g")
-        echo "printf '%s\n' '$line_sanitised' >> $file"
+        printf '%s' "printf '%s\n' '$line_sanitised' >> $file"
 
     ;;
     absent)

docs/changelog

@@ -9,6 +9,7 @@ Changelog
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n
 	* New Type: __hostname (Steven Armstrong)
+	* Type __line: Use printf instead of echo for printing user input
 
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)