Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 15:14:03 +0000 (10:14 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 15:14:03 +0000 (10:14 -0500)
commitb9426a7552cb7f5116b2009a768535cf05093a40
treef57cec0761800030b9b38b6032fd511f21bd63ec
parentf8d306e74dcbd9b1652dfdd7df6b7619adaf66ff
parent8237564b4784c69ab50a9291d503850cb6018f67
Merge branch 'backport' into 3.4-working

Conflicts:

openbox/actions/all.h
Makefile.am
openbox/actions/all.c
openbox/actions/all.h
openbox/session.c