[yaz/epel7: 2/2] Merge branch 'master' into epel7

[Christopher Meng]

commit 4dbe2499c51c4b56e97401f37daf518d01869176
Merge: b23decd 4207bdf
Author: Christopher Meng <i at cicku.me>
Date:   Mon May 5 10:34:27 2014 +0800

    Merge branch 'master' into epel7

 sources  |    2 +-
 yaz.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc yaz.spec
index bbdd45f,162471c..2c25600
--- a/yaz.spec
+++ b/yaz.spec
@@@ -121,9 -121,12 +121,12 @@@ make chec
  %{_mandir}/man1/yaz-config.*
  
  %files -n %{name}-doc
 -%{_pkgdocdir}
 +%{_docdir}/%{name}
  
  %changelog
+ * Mon May 05 2014 Christopher Meng <rpm at cicku.me> - 5.1.1-1
+ - Update to 5.1.1
+ 
  * Sun Apr 20 2014 Christopher Meng <rpm at cicku.me> - 5.1.0-1
  - Update to 5.1.0