[python-apsw: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-apsw

[Marcel Wysocki]

commit 36bff6d944280c64a3e6f12e84fa0d9db3caf099
Merge: 549ae30 d761c83
Author: maci <maci at satgnu.net>
Date:   Wed Sep 25 00:18:52 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-apsw
    
    Conflicts:
    	python-apsw.spec

 python-apsw.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc python-apsw.spec
index a7e3303,c483c8e..731e6b8
--- a/python-apsw.spec
+++ b/python-apsw.spec
@@@ -96,9 -96,9 +96,12 @@@ pop
  %endif # with_python3
  
  %changelog
 +* Tue Sep 24 2013 Marcel Wysocki <maci at satgnu.net> - 3.8.0.r2-1
 +- update to 3.8.0-r2
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.15.2.r1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Fri Feb 15 2013 Marcel Wysocki <maci at satgnu.net> - 3.7.15.2.r1-1
  - update to 3.7.15.2-r1