b5963e1
Merge remote-tracking branch 'origin/el6' Conflicts: .gitignore libstrongswan-plugin.patch libstrongswan-settings-debug.patch sources strongswan-init.patch strongswan-pts-ecp-disable.patch strongswan.spec