From: Mikael Magnusson Date: Sat, 4 Oct 2008 10:52:59 +0000 (+0200) Subject: Merge branch 'mikabox/maybe' into wip/mikabox X-Git-Tag: mikabox-3.4.7.2~25 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8a2805d456247ab75a83c8204a7d54e24c72569f;p=mikachu%2Fopenbox.git Merge branch 'mikabox/maybe' into wip/mikabox --- 8a2805d456247ab75a83c8204a7d54e24c72569f