From: Quan Guo <guotsuan@gmail.com>
Date: Fri, 29 Jan 2016 19:42:56 +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/47a00516d88c42378b487ba302835097c3138099?hp=27ebd0a30d9634ea403a4c9f3c2139c2498faaea

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 }