tree 30ee606da82b0cbcb11ebb303196afb29f4e65e7
parent ec40b897289745da3d67de2cb14be30353003922
parent 7b5ba43ae48c1310e5a615cf9485c1d42f486467
author Jan Engelhardt <jengelh@inai.de> 1349040844 +0200
committer Jan Engelhardt <jengelh@inai.de> 1349041138 +0200

Merge branch 'master' of git://git.inai.de/iptables

Conflicts:
	extensions/GNUmakefile.in

Resolution: trivial, since this was a fuzz 3.

Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.