Merge commit '7783f89cdbb3e3ba57f232552729715148e0b9a1' from hydra

diff --cc packages/hydra/Makefile
Simple merge

diff --cc packages/hydra/README.md
Simple merge

diff --cc packages/hydra/hydra-examples.el
Simple merge

diff --cc packages/hydra/hydra-init.el
index 0000000000000000000000000000000000000000,80b4159ed6192dae3b41a8218f4d1a2dd082daa1..80b4159ed6192dae3b41a8218f4d1a2dd082daa1
mode 000000,100644..100644
--- /dev/null
--- 2/hydra-init.el
+++ b/packages/hydra/hydra-init.el

diff --cc packages/hydra/hydra-ox.el
Simple merge

diff --cc packages/hydra/hydra-test.el
Simple merge

diff --cc packages/hydra/hydra.el
Simple merge

diff --cc packages/hydra/lv.el
Simple merge