From: Rhonda D'Vine <rhonda@debian.org>
Date: Thu, 13 Aug 2015 15:08:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into upstream
X-Git-Tag: upstream/0.6.1~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=69a912c0db0ac135fff332db4f0b05ad9ed2eec6;p=pkg%2Fabook.git

Merge remote-tracking branch 'upstream/master' into upstream
---

69a912c0db0ac135fff332db4f0b05ad9ed2eec6
diff --cc config.guess
index c38553d,b79252d..b79252d
mode 100644,100755..100644
--- a/config.guess
+++ b/config.guess
diff --cc config.sub
index ad9f395,61cb4bc..61cb4bc
mode 100644,100755..100644
--- a/config.sub
+++ b/config.sub