]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bff9ce5 b0a8c7f)
Merge commit 'origin/master'
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 10 Sep 2013 10:54:57 +0000 (12:54 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 10 Sep 2013 10:54:57 +0000 (12:54 +0200)
1  2 
doc/bird.sgml patch | diff1 | diff2 | blob | history

diff --cc doc/bird.sgml
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git