[Swan-commit] Changes to ref refs/heads/master

[Antony Antony]

New commits:
commit e28577d718e801dcace35ab0930416af4cdfc28c
Merge: c31d376 284e7df
Author: Antony Antony <antony at phenome.org>
Date:   Wed Aug 13 21:27:49 2014 +0200

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

commit c31d3764ff128fbf78fbffefa8372d22725376a8
Author: Antony Antony <antony at phenome.org>
Date:   Wed Aug 13 21:23:06 2014 +0200

    remove option --listtraffic use --trafficstatus  instead