From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Wed, 14 Dec 2016 12:44:50 +0000 (+0100)
Subject: Merge branch '1.2.0-dev' into 'master'
X-Git-Tag: v1.2.0-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d210747d92665b6907b04a8c3a5d0a010edcabe4;p=thirdparty%2Fknot-resolver.git

Merge branch '1.2.0-dev' into 'master'

Move the version to 1.2.0-dev

Just marking this as 1.2.0-dev

See merge request !98
---

d210747d92665b6907b04a8c3a5d0a010edcabe4