[yokadi: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/yokadi

[Fabian Affolter]

commit ab4aaf0ac8d259c66450dba1efc1b1e301322fc1
Merge: 8bfa46e d3ce9b5
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Mar 2 10:54:08 2012 +0100

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

 yokadi.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc yokadi.spec
index 7826a91,5dcf084..e568f1c
--- a/yokadi.spec
+++ b/yokadi.spec
@@@ -61,13 -60,19 +60,19 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Wed Feb  8 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13.0-5
+ - Remove the python-sqlite2 dep as yokadi will work with sqlite3 from the stdlib
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 -* Fri Aug 12 2011 Fabian Affolter <fabian at bernewireless.net> - 0.13.0-3
 +* Fri Aug 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.13.0-3
  - Rebuild
  
 -* Mon May 16 2011 Fabian Affolter <fabian at bernewireless.net> - 0.13.0-2
 +* Mon May 16 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.13.0-2
  - python-crypto added
  
 -* Sun Apr 17 2011 Fabian Affolter <fabian at bernewireless.net> - 0.13.0-1
 +* Sun Apr 17 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.13.0-1
  - New requirement: pycrypto (not in Fedora at the moment)
  - Updated to new upstream version 0.13.0