From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 17 Jun 2013 08:04:19 +0000 (+0200)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/e724e4d7cf44ecd4b3f706678fa14f5bfe9b0879?hp=e724e4d7cf44ecd4b3f706678fa14f5bfe9b0879

Merge branch 'master' of tardis:/dotfiles

Conflicts:
	awesome/topbar.lua
---