[elixir/f18: 4/5] Merge branch 'master' into f18

[Ricky Elrod]

commit 5de66fd7d4a3da004c1c60df99e7911879b62501
Merge: d1933ba 5bfc217
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Jun 12 20:51:55 2013 -0400

    Merge branch 'master' into f18

 elixir.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc elixir.spec
index ac209a0,ee437fa..d979621
--- a/elixir.spec
+++ b/elixir.spec
@@@ -15,9 -15,10 +15,10 @@@ URL:            http://elixir-lang.org
  
  Source0:        %{name}-%{version}.tar.gz
  BuildArch:      noarch
+ BuildRequires:  erlang >= R16B
  BuildRequires:  erlang-rebar
  BuildRequires:  git
 -Requires:       erlang-erts >= R16B
 +Requires:       erlang-erts >= R15B
  Requires:       erlang-inets
  
  %description