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

Trivial merge