Merge branch 'master' of git+ssh://git.kirya.net/git/dotfiles/oblogout
authorJulien Valroff <julien@kirya.net>
Sun, 20 Nov 2011 14:12:17 +0000 (15:12 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 20 Nov 2011 14:12:17 +0000 (15:12 +0100)

Trivial merge