From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Wed, 5 Apr 2017 13:32:51 +0000 (+0200)
Subject: Merge branch 'release-1.2.5' into '1.2'
X-Git-Tag: v1.2.5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4efb3e048580dbe65c3e1e12dcd01ff6fef0c4a9;p=thirdparty%2Fknot-resolver.git

Merge branch 'release-1.2.5' into '1.2'

Update NEWS for 1.2.5 release

See merge request !265
---

4efb3e048580dbe65c3e1e12dcd01ff6fef0c4a9