]> git.rmz.io Git - dotfiles.git/commit
Merge branch 'master' of tardis:/dotfiles
authorSamir Benmendil <samir.benmendil@gmail.com>
Mon, 17 Jun 2013 08:04:19 +0000 (10:04 +0200)
committerSamir Benmendil <samir.benmendil@gmail.com>
Mon, 17 Jun 2013 08:04:19 +0000 (10:04 +0200)
commite724e4d7cf44ecd4b3f706678fa14f5bfe9b0879
treebc35ed22c1c04b00a40258dc00773206c9e56f1b
parent36f1d2d21da432e2a705426c798a5176bb9abe50
parent02b6096f614201bdb5089e90247719d8def087fe
Merge branch 'master' of tardis:/dotfiles

Conflicts:
awesome/topbar.lua
awesome/topbar.lua