From 13c6bf953c8f1ea4e03f1b281f4671eabb0c8c14 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Aug 03 2013 20:54:55 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/elixir


Conflicts:
	elixir.spec

---

diff --git a/elixir.spec b/elixir.spec
index 32701df..1d1986d 100644
--- a/elixir.spec
+++ b/elixir.spec
@@ -63,6 +63,9 @@ ln -s %{_datadir}/%{name}/%{version}/bin/{elixir,elixirc,iex} %{buildroot}/%{_bi
 * Sat Aug 3 2013 Ricky Elrod <codeblock@fedoraproject.org> - 0.10.1-1
 - Update to upstream 0.10.1.
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Jul 16 2013 Ricky Elrod <codeblock@fedoraproject.org> - 0.10.0-1
 - Update to upstream 0.10.0.