From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Fri, 26 Oct 2012 19:03:24 +0000 (-0600)
Subject: Merge branch 'master' into chaz
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=9325c92056ff4268db2263cdf8c07bb529e158aa;hp=9325c92056ff4268db2263cdf8c07bb529e158aa;p=chaz%2Fopenbox

Merge branch 'master' into chaz

Conflicts:
	openbox/config.c
---