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

[Paul Wouters]

commit 893ab216fcfdb25e838650f1c6fa96b5728f9363
Merge: a609aca 38a33f1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 23 21:22:32 2014 -0400

    Merge branch 'master' into f19

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