[elixir: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/elixir

[Ricky Elrod]

commit aa8c92c7aebf1ab92b995eb9ff528f4f6689dc4b
Merge: 57a409c 7607bdf
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Aug 1 12:57:22 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/elixir
    
    Conflicts:
    	elixir.spec

 elixir.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc elixir.spec
index ed7563d,c815930..e5be15f
--- a/elixir.spec
+++ b/elixir.spec
@@@ -64,8 -60,8 +64,11 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Wed Aug 1 2012 Ricky Elrod <codeblock at fedoraproject.org> - 0.6.0-1.20120801git01a575e
 +- Update to upstream 0.6.0.
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at 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 at fedoraproject.org> - 0.5.0-1.20120526git6052352
  - Initial build.