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

[Paul Wouters]

New commits:
commit ff463d2cd3c30ad27ccba889c02039e5ed176f1f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 12 04:14:16 2014 -0400

    md->result no longer exists (was remnant of USE_TAPROOM)

commit c841debae31e4df79a287fc29211dc134a1049c7
Merge: e49e64b 832d862
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 12 04:12:43 2014 -0400

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

commit e49e64ba979f51c5216e6a0353b159c2c8bcc9fd
Merge: f99626f 46b984a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Aug 8 10:41:22 2014 -0400

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

commit f99626f36a53cc8b48f9b14d819bb1347899800a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Aug 8 00:24:22 2014 -0400

    testing: remove bogus ikev2-algo-10-camellia_ctr from TESTLIST