Merge branch 'master' into openpgp

Conflicts:
	.travis.yml

src/event/client_events.c

@@ -107,4 +107,4 @@ cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char * const msg)
 {
     message_send_private(privwin->fulljid, msg);
     ui_outgoing_private_msg(privwin, msg);
-}
+}