Merge branch 'backport' into work

Conflicts:

	obt/keyboard.c
	openbox/actions/cyclewindows.c
	openbox/actions/directionalwindows.c
	openbox/frame.c
	openbox/openbox.c

1 files changed, 0 insertions, 1 deletions

diff --git a/tests/usertimewin.c b/tests/usertimewin.c
index 7ef934f2..7a2aa973 100644
--- a/tests/usertimewin.c
+++ b/tests/usertimewin.c
@@ -66,7 +66,6 @@ int main () {
                   PropModeReplace, (unsigned char*)&num, 1);
   XFlush(display);
 
-
   while (1) {
     XNextEvent(display, &report);
   }