]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 036a6e6 8ced4e8)
Merge remote-tracking branch 'origin/master'
authorPaul Jakma <paul@quagga.net>
Fri, 29 Jul 2011 17:21:50 +0000 (18:21 +0100)
committerPaul Jakma <paul@quagga.net>
Fri, 29 Jul 2011 17:21:50 +0000 (18:21 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.