Merge branch 'backport' into work

diff --cc openbox/client.c
Simple merge

diff --cc openbox/event.c
index 44b6eb706c48d544289e6e4772dffdb09785379c,467af11c104a2d96c23845973dd4687e17205e38..30bc656fbfb641724746a47ec6d655bb970a04c2
--- 1/openbox/event.c
--- 2/openbox/event.c
+++ b/openbox/event.c
@@@ -1344,7 -1334,7 +1344,7 @@@ static void event_handle_client(ObClien
              } else
                  ob_debug_type(OB_DEBUG_APP_BUGS,
                                "_NET_ACTIVE_WINDOW message for window %s is "
-                               "missing source indication");
 -                              "missing source indication\n", client->title);
++                              "missing source indication", client->title);
              client_activate(client, TRUE, TRUE, TRUE,
                              (e->xclient.data.l[0] == 0 ||
                               e->xclient.data.l[0] == 2));