From: Ondřej Surý Date: Sun, 17 Jul 2016 18:37:11 +0000 (+0200) Subject: Merge branch 'help-the-emacs-users' into 'master' X-Git-Tag: v1.1.0~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fbb999636ed912a8ada2945aeffeb17e01edb60;p=thirdparty%2Fknot-resolver.git Merge branch 'help-the-emacs-users' into 'master' emacs turds should never make it into git See merge request !34 --- 3fbb999636ed912a8ada2945aeffeb17e01edb60