From 0cee7087eead87d85c3cdd31d14dfd2480fe8ae8 Mon Sep 17 00:00:00 2001
From: Stuart D. Gathman <stuart@gathman.org>
Date: Jul 18 2018 15:18:09 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/cjdns


---

diff --git a/cjdns.spec b/cjdns.spec
index ac2548d..1858592 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -540,8 +540,12 @@ fi
 %{_bindir}/graphStats
 
 %changelog
-* Fri Jun 22 2018 Stuart Gathman <stuart@gathman.org> - 20.2-3
+* Wed Jul 18 2018 Stuart Gathman <stuart@gathman.org> - 20.2-4
 - cjdns-20.2 bundles libuv-0.11.19
+- disable CPU specific optimization
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu May 31 2018 Stuart Gathman <stuart@gathman.org> - 20.2-2
 - Add cnacl s390x support BZ#1584480