[ykclient: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ykclient

[Nick Bebout]

commit b239671584a6a3c02a0f966ed551753d02a85d64
Merge: df77bb8 48df94d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Nov 26 22:01:26 2014 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ykclient
    
    Conflicts:
    	ykclient.spec

 ykclient.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ykclient.spec
index 29c451d,6abeec5..dfb52ec
--- a/ykclient.spec
+++ b/ykclient.spec
@@@ -58,9 -58,9 +58,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libykclient.so
  
  %changelog
 +* Wed Nov 26 2014 Nick Bebout <nb at fedoraproject.org> - 2.13-1
 +- Update to 2.13
 +
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
  * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild