]> git.ipfire.org Git - people/ms/dnsmasq.git/commit
Merge branch 'master' of ssh://thekelleys.org.uk/var/cache/git/dnsmasq
authorSimon Kelley <simon@thekelleys.org.uk>
Sat, 27 Jul 2013 11:32:29 +0000 (12:32 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Sat, 27 Jul 2013 11:32:29 +0000 (12:32 +0100)
commitff1b41dc57a50ebe672a72e4c4e827231312650b
tree1aee2ace33da91dca9f560f63c33a3642ce45e51
parent3953dcc7f263dd84b0c219024f02fdf918ec1873
parentfc4c4fda052591ccbe74db26e8368a460d1b8d5b
Merge branch 'master' of ssh://thekelleys.org.uk/var/cache/git/dnsmasq

Conflicts:
CHANGELOG
CHANGELOG
src/rfc2131.c