[strongswan: 3/3] Merge remote-tracking branch 'origin/f18'

[Pavel Šimerda]

commit bc95a594ac15cbef00300c96bc1534041ae5fd48
Merge: 2ea9d75 d0964cb
Author: Pavel Šimerda <pavlix at pavlix.net>
Date:   Sat Apr 20 04:10:16 2013 +0200

    Merge remote-tracking branch 'origin/f18'
    
    Conflicts:
    	strongswan.spec

 strongswan.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --cc strongswan.spec
index 8be587b,ee22645..c9cda40
--- a/strongswan.spec
+++ b/strongswan.spec
@@@ -277,26 -282,17 +277,27 @@@ f
  * Fri Apr 19 2013 Avesh Agarwal <avagarwa at redhat.com> - 5.0.3-1
  - New upstream release
  - Enabled curl and eap-identity plugins
+ - Enabled support for eap-radius plugin.
  
 +* Thu Apr 18 2013 Pavel Šimerda <psimerda at redhat.com> - 5.0.2-3
 +- Add gettext-devel to BuildRequires because of epel6
 +- Remove unnecessary comments
 +
 +* Tue Mar 19 2013 Avesh Agarwal <avagarwa at redhat.com> - 5.0.2-2
 +- Enabled support for eap-radius plugin.
 +
- * Tue Mar 5 2013 Avesh Agarwal <avagarwa at redhat.com> - 5.0.2-1
- - New upstream release 
+ * Mon Mar 11 2013 Avesh Agarwal <avagarwa at redhat.com> - 5.0.2-1
+ - Update to upstream release 5.0.2
  - Created sub package strongswan-tnc-imcvs that provides trusted network
    connect's IMC and IMV funtionality. Specifically it includes PTS 
    based IMC/IMV for TPM based remote attestation and scanner and test 
    IMCs and IMVs. The Strongswan's IMC/IMV dynamic libraries can be used 
    by any third party TNC Client/Server implementation possessing a 
    standard IF-IMC/IMV interface.
-   
+ 
 +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.1-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Thu Oct 04 2012 Pavel Šimerda <psimerda at redhat.com> - 5.0.1-1
  - Update to release 5.0.1