]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'a5e9f3d26f887deb451a3ea086e52266c117aa0a' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 22:16:39 +0000 (00:16 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 22:16:39 +0000 (00:16 +0200)
1  2 
doc/bird.sgml
tools/Makefile.in

diff --cc doc/bird.sgml
Simple merge
Simple merge