Merge branch 'master' of git+ssh://git.kirya.net/git/dotfiles/openbox
authorJulien Valroff <julien@kirya.net>
Sat, 5 Nov 2011 16:03:48 +0000 (17:03 +0100)
committerJulien Valroff <julien@kirya.net>
Sat, 5 Nov 2011 16:03:48 +0000 (17:03 +0100)

Trivial merge