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

[Antony Antony]

New commits:
commit d4c8e11127ca831633983d6df59392828cb9d362
Merge: abd812c 6af8f3f
Author: Antony Antony <antony at phenome.org>
Date:   Tue Jul 29 20:29:19 2014 -0500

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
    
    Conflicts:
    	testing/utils/dotest.py

commit abd812c88fd21f5ab8bea7e85538129687ac564a
Author: Antony Antony <antony at phenome.org>
Date:   Tue Jul 29 20:27:26 2014 -0500

    testing: fix typo in dotest.py logging.error