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

[Paul Wouters]

New commits:
commit e72a77a38b2814fd05d2bd87f77e170cf28893a5
Merge: 41c6459 590ec24
Author: Paul Wouters <paul at libreswan.org>
Date:   Wed Jan 9 11:32:52 2013 -0500

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

commit 41c64592b2dd6766fdd2073e71259e00a099ff60
Merge: 18b7f2c d0a13fe
Author: Paul Wouters <paul at libreswan.org>
Date:   Wed Jan 9 08:47:57 2013 -0500

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

commit 18b7f2ca7433623c3e4e3e615186fa234c48252d
Author: Paul Wouters <paul at libreswan.org>
Date:   Tue Jan 8 19:02:24 2013 -0500

    * documentation: better document HAVE_OCF in Makefile.inc