From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 2 Feb 2009 14:43:49 +0000 (+0100)
Subject: Merge branch 'work' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~19
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=c422b8a11557400a4514b5d1cf66e7f8ab029d2e;p=mikachu%2Fopenbox.git

Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/event.c
---

c422b8a11557400a4514b5d1cf66e7f8ab029d2e