From: Maria Matejka <mq@ucw.cz>
Date: Wed, 24 Dec 2025 22:19:47 +0000 (+0100)
Subject: Merge branch 'origin/master' into thread-next
X-Git-Tag: v3.2.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ec3cdde9f9e48ec2eae64c17dc255bd3cd61bb6;p=thirdparty%2Fbird.git

Merge branch 'origin/master' into thread-next
---

9ec3cdde9f9e48ec2eae64c17dc255bd3cd61bb6
diff --cc distro/pkg/deb/control
index 6b08813b4,57e3e3a74..095ec5f88
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@@ -17,10 -17,10 +17,10 @@@ Build-Depends-Indep
   linuxdoc-tools-latex,
   opensp,
   texlive-latex-extra,
- Maintainer: Jakub Ružička <jakub.ruzicka@nic.cz>
+ Maintainer: Maria Matejka <maria.matejka@nic.cz>
  Standards-Version: 4.7.0
 -Vcs-Browser: https://salsa.debian.org/debian/bird2
 -Vcs-Git: https://salsa.debian.org/debian/bird2.git
 +Vcs-Browser: https://salsa.debian.org/debian/bird3
 +Vcs-Git: https://salsa.debian.org/debian/bird3.git
  Homepage: https://bird.nic.cz/
  Rules-Requires-Root: no