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

[Paul Wouters]

commit a08226cf90fc20d5832306e02a1be21d05b947a5
Merge: c8a54dc 1b179bf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 23 21:37:51 2014 -0400

    Merge branch 'master' into f20

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