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

[Antony Antony]

New commits:
commit 2c1fc0b344b2d948c99d589700707a73087313c5
Author: Antony Antony <antony at phenome.org>
Date:   Sun Sep 20 22:18:30 2015 +0200

    pluto: replace function ipcmp with sameaddr, to support both v4 and v6
    in foodgroups.c

commit 5e453f2af0a6fc30fb5a99b0c1da132dcefbd3ee
Author: Antony Antony <antony at phenome.org>
Date:   Sun Sep 20 22:13:47 2015 +0200

    testing: fix swantest the directory in table.json was bad