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)
commitb512f6793fc62476872bac9b1771909168d7aafa
tree40b112a19485e55de99a877996118e3210ea5026
parent230f8e559c5ad0d45049df7521b9a983edce02c3
parent0898cd735952f970b24ad2490394d9a332a6f249
Merge branch 'master' of git+ssh://git.kirya.net/git/dotfiles/openbox