From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Fri, 1 May 2015 14:19:05 +0000 (+0200)
Subject: Merge commit '1380f8c1a51f31514125a08f632d017cdfb8e26e' from hydra
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/fddedd20a99a84be82c14bc76c63c56d2fb9b570

Merge commit '1380f8c1a51f31514125a08f632d017cdfb8e26e' from hydra

Conflicts:
	packages/hydra/hydra.el
	packages/hydra/lv.el
---

fddedd20a99a84be82c14bc76c63c56d2fb9b570
diff --cc packages/hydra/.dir-locals.el
index 000000000,eb08357c6..eb08357c6
mode 000000,100644..100644
--- a/packages/hydra/.dir-locals.el
+++ b/packages/hydra/.dir-locals.el