Merge branch 'master' of ssh://code.ffdn.org:55555/gitoyen/bird-config

Conflicts:
	etc/local/bird/bird/bgp.conf

etc/local/bird/bird6/bgp.conf

@@ -174,16 +174,16 @@ protocol bgp franceix_2484 from tpl_franceix_peers {
 	description "FranceIX / AFNIC";
 }
 protocol bgp franceix_42 from tpl_franceix_peers {
-    neighbor 2001:7f8:54::92 as 42;
-    description "FranceIX / AS-PCH";
+	neighbor 2001:7f8:54::92 as 42;
+	description "FranceIX / AS-PCH";
 }
 protocol bgp franceix_3856 from tpl_franceix_peers {
-    neighbor 2001:7f8:54::91 as 3856;
-    description "FranceIX / AS-PCH";
+	neighbor 2001:7f8:54::91 as 3856;
+	description "FranceIX / AS-PCH";
 }
 protocol bgp franceix_39405 from tpl_franceix_peers {
-    neighbor 2001:7f8:54::220 as 39405;
-    description "FranceIX / FULLSAVE-AS";
+	neighbor 2001:7f8:54::220 as 39405;
+	description "FranceIX / FULLSAVE-AS";
 }
 
 #
@@ -250,7 +250,7 @@ protocol bgp equinix_2486 from tpl_equinix_peers {
 	import limit 50;
 }
 protocol bgp equinix_43142 from tpl_equinix_peers {
-    neighbor 2001:7f8:43::4:3142:1 as 43142;
-    description "EquinIX / AS-Adelinovius";
-    import limit 150;
+	neighbor 2001:7f8:43::4:3142:1 as 43142;
+	description "EquinIX / AS-Adelinovius";
+	import limit 150;
 }