Merge branch 'master' of git.nic.cz:turris/misc

mail_notifier/notifier

@@ -41,6 +41,7 @@ create_msmtp_config() {
 	echo "from $from" >> "$msmtp_cfg_file"
 	echo "user $username" >> "$msmtp_cfg_file"
 	echo "password $password" >> "$msmtp_cfg_file"
+        echo "timeout 30" >> "$msmtp_cfg_file"
 	echo "account default: notifier" >> "$msmtp_cfg_file"
 }