Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-11-12 10:01:09 +00:00
commit 333da3b64b

View File

@ -84,7 +84,7 @@ const struct options_table_entry server_options_table[] = {
{ .name = "history-file", { .name = "history-file",
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.default_str = NULL .default_str = ""
}, },
{ .name = "message-limit", { .name = "message-limit",