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

[Antony Antony]

New commits:
commit e3c6cc6e39a868910f9200187d554bc5ae8cb8f9
Author: Antony Antony <antony at phenome.org>
Date:   Mon Sep 7 18:57:29 2015 +0200

    testing: match testoutputs to changes in init.sh

commit a4c29d2c79b96743bf62c5b4da82fd2c69fdc9bc
Author: Antony Antony <antony at phenome.org>
Date:   Mon Sep 7 10:33:17 2015 +0200

    pluto use nullgw struct instead of sticking it in c