Merge branch 'master' into add-path

Conflicts:

	filter/filter.c
	nest/proto.c
	nest/rt-table.c
	proto/bgp/bgp.h
	proto/bgp/config.Y

1 files changed, 42 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 3aaa4dd6..1341fcd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,44 @@
+Version 1.3.12 (2013-11-23)
+  o BFD protocol (RFC 5880).
+  o BFD support for OSPF and BGP.
+  o New 'allow local as' option for BGP.
+  o Filters allows setting gw, ifname and ifindex.
+  o Filter operator 'delete/filter' extended to bgp_paths.
+  o Filter operator 'len' extended to [e]clists.
+  o PID file support.
+  o Several bugfixes and minor improvements.
+ 
+Version 1.3.11 (2013-07-27)
+  o OSPF stub router option (RFC 3137).
+  o TTL security for OSPF and RIP.
+  o Protocol packet priority and traffic class handling.
+  o Multiple routing tables support for FreeBSD and OpenBSD.
+  o Extends constants to all filter data types.
+  o Implements eval command.
+  o 'bgppath ~ int set' filter operation.
+  o Several bugfixes.
+
+Version 1.3.10 (2013-04-30)
+  o Lightweight BIRD client for embedded environments.
+  o Dynamic IPv6 router advertisements.
+  o New 'next hop keep' option for BGP.
+  o Smart default routing table for 'show route export/preexport/protocol'.
+  o Automatic router ID selection could be configured to use address of loopback.
+  o Allows configured global addresses of NBMA neighbors in OSPFv3.
+  o Allows BIRD commands from UNIX shell even in restricted mode.
+  o Route limits inherited from templates can be disabled.
+  o Symbol names enclosed by apostrophes can contain dots.
+  o Several bugfixes.
+
+Version 1.3.9 (2013-01-11)
+  o BIRD can be configured to keep and show filtered routes.
+  o Separate receive and import limits.
+  o Several new reconfiguration cmd options (undo, timeout, check).
+  o Configurable automatic router ID selection.
+  o Dragonfly BSD support.
+  o Fixed OSPFv3 vlinks.
+  o Several minor bugfixes.
+
 Version 1.3.8 (2012-08-07)
   o Generalized import and export route limits.
   o RDNSS and DNSSL support for RAdv.
@@ -11,7 +52,7 @@ Version 1.3.8 (2012-08-07)
 Version 1.3.7 (2012-03-22)
   o Route Origin Authorization basics.
   o RIPng working again.
-  o Extended clist operations in filters. 
+  o Extended clist operations in filters.
   o Fixes several bugs in BSD iface handling.
   o Several minor bugfixes and enhancements.