]> git.lizzy.rs Git - bspwm.git/commitdiff
Merge branch 'master' into history
authorBastien Dejean <nihilhill@gmail.com>
Mon, 6 May 2013 13:07:19 +0000 (15:07 +0200)
committerBastien Dejean <nihilhill@gmail.com>
Mon, 6 May 2013 13:07:19 +0000 (15:07 +0200)

Trivial merge