Merge branch 'master' of git://mikachu.ath.cx/openbox