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

[Tuomo Soini]

New commits:
commit f0530a007b8b7a17db4c100b035c099081dce311
Merge: 21045bd 6e9f6f9
Author: Tuomo Soini <tis at foobar.fi>
Date:   Mon Mar 11 19:52:54 2013 +0200

    Merge branch 'fragmentation'

commit 6e9f6f959b63db72a429449fa844320437d9feaa
Merge: 54ad009 21045bd
Author: Tuomo Soini <tis at foobar.fi>
Date:   Mon Mar 11 19:36:10 2013 +0200

    Merge branch 'master' into fragmentation

commit 54ad009025f27f364df94691a16a8bc453464f5d
Author: Tuomo Soini <tis at foobar.fi>
Date:   Mon Mar 11 07:53:17 2013 +0200

    ipsec.conf: Fix some typos in ike_frag= documentation