Simon Kelley 6bd3a09fb8 Merge branch 'edns0' ...

Conflicts:
	CHANGELOG
	src/dnsmasq.h
	src/option.c

2013-10-11 10:25:56 +01:00

..

es

import of dnsmasq-2.53.tar.gz

2012-01-05 17:31:15 +00:00

fr

Update French translation.

2013-04-17 13:52:49 +01:00

dnsmasq.8

Merge branch 'edns0'

2013-10-11 10:25:56 +01:00