From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 23 Apr 2008 15:07:42 +0000 (+0200)
Subject: Merge branch 'work' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~43
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=953dcb9c8b72861b2e82d9d01c2b00de510fcc14;p=mikachu%2Fopenbox.git

Merge branch 'work' into wip/mikabox

Conflicts:

	openbox/moveresize.c
---

953dcb9c8b72861b2e82d9d01c2b00de510fcc14