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

[Stefan Schulze Frielinghaus]

commit 4acee49bdb3a220a7ebc7e315cd014673bc21d51
Merge: ec2d8a9 d4b9b2a
Author: Stefan Schulze Frielinghaus <stefansf at fedoraproject.org>
Date:   Sun Feb 5 14:23:18 2012 +0100

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

 sec.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sec.spec
index a5835c9,9878c9c..09cb9d0
--- a/sec.spec
+++ b/sec.spec
@@@ -107,9 -107,9 +107,12 @@@ rm -rf %{buildroot
  %{_unitdir}/sec.service
  
  %changelog
 +* Sun Feb 5 2012 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 2.6.2-0
 +- New upstream release
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Sep 19 2011 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 2.6.1-0
  - New upstream release