From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Thu, 14 Aug 2014 18:39:50 +0000 (-0600)
Subject: Merge branch 'master' into chaz
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=d67b818ae90c5574166d08422d3e9a68d8d65e16;hp=d67b818ae90c5574166d08422d3e9a68d8d65e16;p=chaz%2Fopenbox

Merge branch 'master' into chaz

Conflicts:
	openbox/moveresize.c
---