From: Ondřej Surý Date: Wed, 5 Apr 2017 11:16:20 +0000 (+0200) Subject: Merge branch 'rsync-travis-fix' into '1.2' X-Git-Tag: v1.2.5~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f25542e3c54172382271ad444d7541dbea69482;p=thirdparty%2Fknot-resolver.git Merge branch 'rsync-travis-fix' into '1.2' Rsync travis fix See merge request !261 --- 9f25542e3c54172382271ad444d7541dbea69482