| commit | 6bd3a09fb8683bf2693051f2693f2d332405ec0b | [log] [tgz] |
|---|---|---|
| author | Simon Kelley <simon@thekelleys.org.uk> | Fri Oct 11 10:25:56 2013 +0100 |
| committer | Simon Kelley <simon@thekelleys.org.uk> | Fri Oct 11 10:25:56 2013 +0100 |
| tree | d2101cc70bfc1f287ba1b173ed5b35534acd5738 | |
| parent | 8584c502d37627d8abe18213771b5f4f98cb4aa3 [diff] | |
| parent | f65b0e546b96d0499448b04500ef63f664450fe4 [diff] |
Merge branch 'edns0' Conflicts: CHANGELOG src/dnsmasq.h src/option.c