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

[Fabian Affolter]

commit 39a56f37d4f3f334620bfbc9d4b54e6087ed6d93
Merge: 6f3c345 5e2490b
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Mon Aug 5 16:02:41 2013 +0200

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

 autoarchive.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc autoarchive.spec
index cc01b10,00051d6..362f492
--- a/autoarchive.spec
+++ b/autoarchive.spec
@@@ -44,10 -44,9 +44,13 @@@ which reads information from it and cre
  %{python3_sitelib}/%{name}*.egg-info
  
  %changelog
 +* Mon Aug 05 2013 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.1-2
 +- Spec file updated
 +- Fixed FTBFS (#992000)
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Sat Mar 02 2013 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.1-1
  - Updated to latest upstrema version 1.0.1