2 commits

Author	SHA1	Message	Date
Dan Hirsch	40be28fb7e	Merge remote-tracking branch 'bunter/master' ... Also, fix makefile Conflicts: src/hammer.c	2012-05-24 15:51:42 +02:00
Meredith L. Patterson	8e7a5cc2d3	getting the examples into the build, dns validator needs finished	2012-05-24 12:43:32 +02:00