Merge branch 'frr/pull/92' (BGP Large Community support)

Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_packet.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_routemap.c
index 50524baa0125ecbd85b794d4f0d87c65535ab1e6,a3c61e21558d846944953b6696b1a77f70120d63..58788d20416e6205e6ed9e4fb59a411991d8e252
--- 1/bgpd/bgp_routemap.c
--- 2/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@@ -4158,8 -4429,9 +4566,10 @@@ bgp_route_map_init (void
    route_map_install_set (&route_set_aggregator_as_cmd);
    route_map_install_set (&route_set_community_cmd);
    route_map_install_set (&route_set_community_delete_cmd);
+   route_map_install_set (&route_set_lcommunity_cmd);
+   route_map_install_set (&route_set_lcommunity_delete_cmd);
    route_map_install_set (&route_set_vpnv4_nexthop_cmd);
 +  route_map_install_set (&route_set_vpnv6_nexthop_cmd);
    route_map_install_set (&route_set_originator_id_cmd);
    route_map_install_set (&route_set_ecommunity_rt_cmd);
    route_map_install_set (&route_set_ecommunity_soo_cmd);

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge