From: Mikael Magnusson Date: Sun, 4 May 2008 10:06:25 +0000 (+0200) Subject: Merge branch 'work' into wip/mikabox X-Git-Tag: mikabox-3.4.7.2~39 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=9801465e47c22fbc0c5829f831dc8a0b5b453dbb;p=mikachu%2Fopenbox.git Merge branch 'work' into wip/mikabox --- 9801465e47c22fbc0c5829f831dc8a0b5b453dbb