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

[Tuomo Soini]

New commits:
commit f1c23c6492a56736d3a31ce0b204495d9cfc2e82
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 25 14:59:59 2014 +0200

    ProgrammingConventions.txt: update documentatio for post 3.4 style

commit bb34271ad894cb820327389679b93729550e68f2
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 25 13:40:14 2014 +0200

    pluto-style.el: remove legacy emacs style

commit ab5e381d96bd7cac26a5a1f105e6d48a0b9fb54f
Merge: d06a04c 3d9fac6
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 25 08:43:40 2014 +0200

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

commit d06a04caf1cb11abb6a778ea8795acd87c173a8c
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Mar 25 08:43:25 2014 +0200

    timer.c: coding style, only full tabs