Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --git a/bird/bird.nm b/bird/bird.nm
index b957f6fe58d46b4403b04eefa3696cdec423ac73..977a014e376d42ef31606fbc2f2aad10162f1a7a 100644 (file)
--- a/bird/bird.nm
+++ b/bird/bird.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = bird
-version    = 1.3.7
+version    = 1.4.0
 release    = 1
 
 groups     = Networking/Routing

diff --git a/tinc/tinc.nm b/tinc/tinc.nm
index 48eb0e4f3153037a0af0a719ade70dd079fa0773..c1a86241cac696ca80478d4923c64d6cc1875f4b 100644 (file)
--- a/tinc/tinc.nm
+++ b/tinc/tinc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = tinc
-version    = 1.0.19
+version    = 1.0.23
 release    = 1
 
 groups     = Networking/Tools