[enlightenment/f19: 3/3] Merge branch 'master' into f19

[Dan Mashal]

commit 3805f55b1ab559ac35411c7c76ce00de1f4322fc
Merge: 0f5e1c6 abbb1b3
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Nov 12 21:19:20 2013 -0800

    Merge branch 'master' into f19
    
    Conflicts:
    	enlightenment.spec

 .gitignore         |    1 +
 enlightenment.spec |   38 ++++++++++++++++++--------------------
 sources            |    2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)
---
diff --cc enlightenment.spec
index d3a8544,169b2b1..987cc95
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@@ -94,9 -89,9 +89,12 @@@ desktop-file-validate %{buildroot}/%{_d
  %{_includedir}/enlightenment
  
  %changelog
+ * Thu Nov 07 2013 Dan Mashal <dan.mashal at fedoraproject.org> 0.17.5-1
+ - Update to 0.17.5
+ 
 +* Mon Oct 07 2013 Dan Mashal <dan.mashal at fedoraproject.org> 0.17.4-5
 +- Fix startup crashes.
 +
  * Mon Oct 07 2013 Dan Mashal <dan.mashal at fedoraproject.org> 0.17.4-4
  - Add hard runtime requirements so one package can install the entire stack.