christos 00a838c4a5 merge conflicts.

2013-11-08 19:18:24 +00:00

..

dist/ipsec-tools

remove unused variables

2013-10-20 21:17:28 +00:00

external

merge conflicts.

2013-11-08 19:18:24 +00:00

Makefile.openssl

…

TODO

…