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

[Antony Antony]

New commits:
commit 7f2ab7dffe3f52fda54b2410e5ef729eb47e36cb
Author: Antony Antony <antony at phenome.org>
Date:   Sun Sep 20 23:14:34 2015 +0200

    pluto: replace function ipcmp with addrcmp, to support both v4 and v6
    ipcmp is not used else where so get rid of it.

commit cfcd9421b4336076dbebc39730efe9d062472065
Author: Antony Antony <antony at phenome.org>
Date:   Sun Sep 20 22:59:41 2015 +0200

    Revert "pluto: replace function ipcmp with sameaddr, to support both v4 and v6"
    
    This reverts commit 2c1fc0b344b2d948c99d589700707a73087313c5.