[uthash/el6: 3/3] Merge branch 'master' into el6

[Christopher Meng]

commit 567ec3a5ab62bf914e3d327ffaf99b492fafc89f
Merge: 56ed118 a3edc2d
Author: Christopher Meng <i at cicku.me>
Date:   Tue May 6 11:56:48 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	uthash.spec

 .gitignore  |    1 +
 sources     |    2 +-
 uthash.spec |   31 +++++++++++++++++--------------
 3 files changed, 19 insertions(+), 15 deletions(-)
---
diff --cc uthash.spec
index e65d895,e529cf7..1ac02f8
--- a/uthash.spec
+++ b/uthash.spec
@@@ -38,6 -38,12 +38,9 @@@ cd tests && make %{?_smp_mflags
  %{_includedir}/ut*.h
  
  %changelog
+ * Sat Mar 29 2014 Christopher Meng <rpm at cicku.me> - 1.9.9-1
+ - Update to 1.9.9
+ 
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.8-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Sat Jun 15 2013 Christopher Meng <rpm at cicku.me> - 1.9.8-3
  - Add virtual provide.
  - Remove 2 wrong tests.