Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-08 10:01:16 +00:00
23 changed files with 35 additions and 41 deletions

View File

@ -941,7 +941,7 @@ server_client_set_title(struct client *c)
template = options_get_string(s->options, "set-titles-string");
ft = format_create();
ft = format_create(0);
format_defaults(ft, c, NULL, NULL, NULL);
title = format_expand_time(ft, template, time(NULL));