[ykpers: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ykpers

[Maxim Burgerhout]

commit e85cde77a7fea7c8b58c05b63e8550bb8f6d57d3
Merge: 651d6dc 69586f4
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Wed May 15 15:28:21 2013 +0200

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

 ykpers.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ykpers.spec
index 4ec027e,fbde9f7..1022299
--- a/ykpers.spec
+++ b/ykpers.spec
@@@ -81,12 -81,9 +81,15 @@@ export LD_LIBRARY_PATH=$RPM_BUILD_DIR/%
  %exclude %{_libdir}/libykpers-1.la
  
  %changelog
 +* Mon May 13 2013 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.13.0-1
 +- Update to 1.13.0: ycfg-json functions, recognize newer firmware
 +
 +* Fri Dec 21 2012 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.11.1-1
 +- Update to new upstream version 1.11.1: better support for NEO
 +
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Nov 8 2012 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.9.0-1
  - Update to new upstream version 1.9.0