From: aquerubin <tony@lavanauts.org>
Date: Wed, 20 Jul 2016 19:07:20 +0000 (-1000)
Subject: Merge updates from branch 'master' into newdns
X-Git-Tag: v0.88~43^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F123%2Fhead;p=thirdparty%2Fmtr.git

Merge updates from branch 'master' into newdns
---

b6b45242b2f0e20841bcfb4552b1e4bbc3fc087a