[libreswan/f20: 2/4] Merge branch 'master' into f20

[Paul Wouters]

commit c8a54dcb7da3a2665091b19df08e161f3f73a26c
Merge: f7ae240 38a33f1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 23 21:09:33 2014 -0400

    Merge branch 'master' into f20

 .gitignore     |    1 +
 libreswan.spec |   14 +++++---------
 sources        |    2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)
---