From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 8 Mar 2008 17:36:47 +0000 (+0100)
Subject: Merge branch 'mikabox/actions' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~53
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bf84522ae59efabab6ea3f85e7331626df34d8a1;p=mikachu%2Fopenbox.git

Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:

	openbox/actions/all.c
---

bf84522ae59efabab6ea3f85e7331626df34d8a1