From: Mikael Magnusson Date: Fri, 20 Feb 2009 16:45:24 +0000 (+0100) Subject: Merge branch 'work' into wip/mikabox X-Git-Tag: mikabox-3.4.7.2~14 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8f4b12123ba531dd55c8f0b1d75ce501c7cd512d;p=mikachu%2Fopenbox.git Merge branch 'work' into wip/mikabox --- 8f4b12123ba531dd55c8f0b1d75ce501c7cd512d