]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'origin/master'
authorOndrej Zajicek <santiago@crfreenet.org>
Fri, 1 Apr 2011 11:56:42 +0000 (13:56 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Fri, 1 Apr 2011 11:56:42 +0000 (13:56 +0200)

Trivial merge