[lfcxml/el6: 4/4] Merge branch 'master' into el6

[Christopher Meng]

commit e880be5f79881d1f516254e3479a5ff7635d148c
Merge: e98e60d 80db292
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jan 21 11:11:10 2014 +0800

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

 .gitignore  |    1 +
 lfcxml.spec |   48 ++++++++++++++++++++++--------------------------
 sources     |    3 +--
 3 files changed, 24 insertions(+), 28 deletions(-)
---
diff --cc lfcxml.spec
index adfdb91,7d1b83c..dcf08e8
--- a/lfcxml.spec
+++ b/lfcxml.spec
@@@ -59,8 -52,14 +52,11 @@@ make chec
  %{_libdir}/*.so
  
  %changelog
+ * Tue Jan 21 2014 Christopher Meng <rpm at cicku.me> - 1.1.6-1
+ - Update to 1.1.6
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Wed Jul 03 2013 Christopher Meng <rpm at cicku.me> - 1.1.4-1
- - New release.
+ - Update to 1.1.4
  
  * Tue May 21 2013 Christopher Meng <rpm at cicku.me> - 1.1.3-2
  - Fix the license problem.