From aa8c92c7aebf1ab92b995eb9ff528f4f6689dc4b Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Aug 01 2012 16:57:22 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/elixir


Conflicts:
	elixir.spec

---

diff --git a/elixir.spec b/elixir.spec
index ed7563d..e5be15f 100644
--- a/elixir.spec
+++ b/elixir.spec
@@ -67,5 +67,8 @@ rm -rf %{buildroot}
 * Wed Aug 1 2012 Ricky Elrod <codeblock@fedoraproject.org> - 0.6.0-1.20120801git01a575e
 - Update to upstream 0.6.0.
 
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-2.20120526git6052352
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Sat May 26 2012 Ricky Elrod <codeblock@fedoraproject.org> - 0.5.0-1.20120526git6052352
 - Initial build.