tree 7e1ab88ae5b118b77f2e529407de09d81a6edc19
parent 1ac30c97c339957b6e3c5cf571de7bc38c827730
parent e82a71d7de5f6e364738dbb7154b88bfff8a5fcd
author Pablo Neira Ayuso <pablo@netfilter.org> 1365178316 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> 1365178368 +0200

Merge branch 'stable'

Resolve conflict with Nicolas' Dichtel update on utils/Makefile.am
for nfnl_osf.