Merge branch 'master' of git://git.openbox.org/dana/openbox