From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Feb 2014 15:37:43 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=84581c2d9b890587e6f56448b509970b3240a887;hp=87621bcc7aceddb24b80ebffc529a176080cfed3

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

diff --git a/bird/bird.nm b/bird/bird.nm
index b957f6fe5..977a014e3 100644
--- 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 48eb0e4f3..c1a86241c 100644
--- 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