Merge branch 'master' into dev

diff --cc doc/bird.sgml
index d0fe47d00b00ad8fc1fccc04802b9648e7bab72b,f62881c3e29c9eb996e11ca498ad09698b9e75dd..c73872b7a5147242029edaa3551b4becef85ddc1
--- 1/doc/bird.sgml
--- 2/doc/bird.sgml
+++ b/doc/bird.sgml
@@@ -451,9 -367,12 +451,12 @@@ This argument can be omitted if there e
        a given filter (<cf>filter <m/name/</cf> or <cf>filter { <m/filter/ }
        </cf> or matching a given condition (<cf>where <m/condition/</cf>).
        The <cf/import/ and <cf/preimport/ switches ask for printing of entries
 -        that are imported to the specified protocol. With <cf/preimport/, the
 +      that are imported to the specified protocol. With <cf/preimport/, the
        import filter of the protocol is skipped.
  
+       <p>You can also select just routes added by a specific protocol.
+       <cf>protocol <m/p/</cf>.
+ 
        <p>The <cf/stats/ switch requests showing of route statistics (the
        number of networks, number of routes before and after filtering). If
        you use <cf/count/ instead, only the statistics will be printed.

diff --cc nest/config.Y
Simple merge