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

[Paul Wouters]

commit 7b14f2e5a43d141c771e5e2b51c740a5dd52d760
Merge: 893ab21 1b179bf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 23 21:38:05 2014 -0400

    Merge branch 'master' into f19

 libreswan.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---