Dan Hirsch 40be28fb7e Merge remote-tracking branch 'bunter/master' ... Also, fix makefile Conflicts: src/hammer.c		2012-05-24 15:51:42 +02:00
..
dns.c	had qname wrong, fixed it	2012-05-24 13:58:38 +02:00
Makefile	Merge remote-tracking branch 'bunter/master'	2012-05-24 15:51:42 +02:00