]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'origin/master'
authorOndrej Zajicek <santiago@crfreenet.org>
Fri, 6 May 2011 20:09:44 +0000 (22:09 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Fri, 6 May 2011 20:09:44 +0000 (22:09 +0200)

Trivial merge