| commit | 5a4120dbfb2b44a55b5327daf7b3157a12416df7 | [log] [tgz] |
|---|---|---|
| author | Simon Kelley <simon@thekelleys.org.uk> | Fri Oct 25 13:13:11 2013 +0100 |
| committer | Simon Kelley <simon@thekelleys.org.uk> | Fri Oct 25 13:16:27 2013 +0100 |
| tree | 8d3d70c7e2d2f7ed18e594aaffed2f588e28a264 | |
| parent | 687bac22dbae4c4f36f9021407d110336e7a3463 [diff] | |
| parent | eec5c1e21c5e021e272162c9bccc61400bc1660a [diff] |
Merge branch 'master' into dnssec Conflicts: src/dnsmasq.h src/forward.c src/option.c