Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 08:47:02 +0000 (03:47 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 08:47:02 +0000 (03:47 -0500)
commitf3d40932a96fd92fc383ed212c753f83f8417d77
tree03d9a65aa367f10455165a2bb45f4c1a410cbc71
parentbf52dae83e703a904f2589a91790d3018c9e6a54
parent9089156780d83a8b8d72df711a895fce9519077b
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