Merge branch 'enable-elixir-in-mix' of https://github.com/ukutaht/ejabberd into ukuta...

diff --cc mix.exs
index d1ef0fbbba91b72e5f6b72755726e7f0d75c95ec,fc9fcea01f52a3a31467bf10d0de86164e5525fa..b9ff8794ead406c59fd932cb1f0e3d66a6d8962b
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -34,8 -35,8 +34,8 @@@ defmodule Ejabberd.Mixfile d
  
    defp erlc_options do
      # Use our own includes + includes from all dependencies
 -    includes = ["include"] ++ Path.wildcard(Path.join("..", "/*/include"))
 +    includes = ["include"] ++ Path.wildcard("deps/*/include")
-     [:debug_info] ++ Enum.map(includes, fn(path) -> {:i, path} end)
+     [:debug_info, {:d, :ELIXIR_ENABLED}] ++ Enum.map(includes, fn(path) -> {:i, path} end)
    end
  
    defp deps do