[ykclient: 2/3] Merge branch 'epel7'

[Nick Bebout]

commit df77bb8f66712d693d16ac492c9a3ba3d0ccb145
Merge: 7d087c0 5a53f9e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Nov 26 22:00:38 2014 -0600

    Merge branch 'epel7'
    
    Conflicts:
    	ykclient.spec

 .gitignore    |    1 +
 sources       |    1 +
 ykclient.spec |    7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc ykclient.spec
index 257d1b9,bd07c29..29c451d
--- 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
+ 
 +* 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
 +
  * Thu Mar 13 2014 Nick Bebout <nb at fedoraproject.org> - 2.12-1
  - Update to 2.12