]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'origin/master'
authorOndrej Zajicek <santiago@crfreenet.org>
Sun, 15 Apr 2012 13:15:05 +0000 (15:15 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Sun, 15 Apr 2012 13:15:05 +0000 (15:15 +0200)

Trivial merge