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

[Sergio Pascual]

commit 831de40bca57a64f554b27b034ef6ef15dcf459d
Merge: 8b460cd 89742d5
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jun 13 16:36:01 2014 +0200

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

 esorex.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc esorex.spec
index 5c81ffa,4857b53..a3f4853
--- a/esorex.spec
+++ b/esorex.spec
@@@ -38,9 -38,9 +38,12 @@@ make DESTDIR=%{buildroot} instal
  %{_bindir}/*
  
  %changelog
 +* Fri Jun 13 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 3.10.2-1
 +- New upstream version (3.10.2)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Thu Dec 05 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 3.10-1
  - New upstream version (3.10)
  - Fixes format security bug (bz #1037055)