]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31d0f1b 0d51c7e)
Merge remote-tracking branch 'remotes/quagga/master'
authorPaul Jakma <paul@quagga.net>
Tue, 29 Mar 2011 13:25:56 +0000 (14:25 +0100)
committerPaul Jakma <paul@quagga.net>
Tue, 29 Mar 2011 13:25:56 +0000 (14:25 +0100)

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