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

[Pavel Alexeev]

commit a53a84a752ecc1f23eb39b6418aa3daf3acf53c6
Merge: 4db8e41 6e5c890
Author: Hubbitus <pahan at hubbitus.info>
Date:   Sun Sep 7 19:14:08 2014 +0400

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

 perdition.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc perdition.spec
index d7227e3,0ce53fb..061b0d5
--- a/perdition.spec
+++ b/perdition.spec
@@@ -304,10 -307,12 +304,16 @@@ f
  %{_mandir}/man8/%{name}db_odbc_makedb.*
  
  %changelog
 +* Sun Sep 7 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 2.1-1
 +- Update to version 2.1 - bz#1136114.
 +- Drop Patch1: perdition-2.0-starttls.patch
 +
+ * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Sun Nov 24 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0-4
  - Change *.service file permissions to 0644.