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

[Christopher Meng]

commit b23decd040b0f2f8d9f3df6c738e8e1da5827f66
Merge: 4676365 e15eb60
Author: Christopher Meng <i at cicku.me>
Date:   Sun Apr 20 17:53:29 2014 +0800

    Merge branch 'master' into epel7

 sources  |    2 +-
 yaz.spec |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc yaz.spec
index c730eb3,30dab87..bbdd45f
--- 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
+ * Sun Apr 20 2014 Christopher Meng <rpm at cicku.me> - 5.1.0-1
+ - Update to 5.1.0
+ 
  * Tue Mar 25 2014 Christopher Meng <rpm at cicku.me> - 5.0.21-1
  - Update to 5.0.21
  - Build with memcached support for ZOOM caching.