Repositories / oonf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 530968c ea5ded9)
Merge http://olsr.org/git/oonf
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 26 May 2015 11:36:47 +0000 (13:36 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 26 May 2015 11:36:47 +0000 (13:36 +0200)

Trivial merge
OLSR.org network framework (including Olsrd2 and DLEP)