From: Antonio Querubin <tony@lavanauts.org>
Date: Sat, 30 Apr 2016 11:42:41 +0000 (-1000)
Subject: Merge remote-tracking branch 'origin/master' into newdns
X-Git-Tag: v0.88~43^2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F111%2Fhead;p=thirdparty%2Fmtr.git

Merge remote-tracking branch 'origin/master' into newdns

Conflicts:
	dns.c
---

e56513911787c7fc58edfc18f5c6d8d6d7ecd19d