From: Quan Guo <guotsuan@gmail.com>
Date: Mon, 29 Feb 2016 20:04:00 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/copycat-killer/lain
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/466c48d20a13a447afaec373b700a5cd2e3fa877?hp=5e53a6e620172389f941f01ce91a00a18fafe35e

Merge branch 'master' of https://github.com/copycat-killer/lain
---

diff --git a/helpers.lua b/helpers.lua
index 4ece329..5e958c3 100644
--- a/helpers.lua
+++ b/helpers.lua
@@ -8,7 +8,7 @@
 
 local debug  = require("debug")
 
-local capi   = { timer = timer }
+local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }