]> git.ipfire.org Git - thirdparty/iptables.git/commit
projects / thirdparty / iptables.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ac30c9 e82a71d)
Merge branch 'stable'
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 5 Apr 2013 16:11:56 +0000 (18:11 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 5 Apr 2013 16:12:48 +0000 (18:12 +0200)
commitc8cf36930144ea49d1f5cb29835547b1baededfd
tree7e1ab88ae5b118b77f2e529407de09d81a6edc19tree | snapshot
parent1ac30c97c339957b6e3c5cf571de7bc38c827730commit | diff
parente82a71d7de5f6e364738dbb7154b88bfff8a5fcdcommit | diff
Merge branch 'stable'

Resolve conflict with Nicolas' Dichtel update on utils/Makefile.am
for nfnl_osf.
utils/Makefile.am diff1 | diff2 | blob | history
Mirror of git://git.netfilter.org/iptables