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

[Athmane Madjoudj]

commit cdcd6aa47eca0ae6b581a77d9b71a0d28e737135
Merge: 30190f1 1544d3a
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Wed Jul 25 20:42:04 2012 +0100

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

 greybird.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc greybird.spec
index b6241a4,d614d02..e35c5b8
--- a/greybird.spec
+++ b/greybird.spec
@@@ -115,10 -112,9 +115,14 @@@ cp -pr gtk-2.0/ gtk-3.0/ metacity-1/ xf
  %{_datadir}/themes/%{theme_name}/xfce-notify-4.0/
  
  %changelog
++<<<<<<< HEAD
 +* Wed Jul 25 2012 Athmane Madjoudj <athmane at fedoraproject.org> 0.9-1
 +- Update to the new release.
 +- Remove unico engine dep.
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Mon Jul 02 2012 Athmane Madjoudj 0.8.2-4
  - Remove unity import in gtk3 css.