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

[Paul Wouters]

commit aa1367e2d62962cecc463e629dce33f7f29a2b25
Merge: 9e5addf a18af14
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jul 10 11:53:03 2014 -0400

    Merge branch 'master' into f20

 .gitignore     |    1 +
 libreswan.spec |   17 +++++++++++++----
 sources        |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
---