From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 11 Aug 2013 09:55:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'dana/work' into wip/mikabox
X-Git-Tag: mikabox-3.5-7~24
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=9483d326bb6691dbf356ebb595cabb8ab1ca74d4

Merge remote-tracking branch 'dana/work' into wip/mikabox

Conflicts:
	openbox/place.c
	openbox/place_overlap.c
---

9483d326bb6691dbf356ebb595cabb8ab1ca74d4