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

[Jon Ciesla]

commit d55d5b833a8e05696ddf3650083e1f87cdbf3c65
Merge: 3c4d483 31bfe15
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Jan 22 11:36:11 2014 -0600

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

 entangle.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc entangle.spec
index 1bc48dd,490b08a..2fbe61f
--- a/entangle.spec
+++ b/entangle.spec
@@@ -115,8 -115,8 +115,13 @@@ glib-compile-schemas /usr/share/glib-2.
  %dir %{_datadir}/%{name}/plugins
  
  %changelog
++<<<<<<< HEAD
 +* Wed Jan 22 2014 Jon Ciesla <limburgher at gmail.com> - 0.5.4-2
 +- Rebuild for new LibRaw.
++=======
+ * Wed Jan 22 2014 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-2
+ - Rebuild for new LibRaw
++>>>>>>> 31bfe15b91e74d901add5130d8dbddcd02071d50
  
  * Sun Dec 15 2013 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-1
  - Update to 0.5.4 release