projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca88566 eae7308)
Merge pull request #151 from stevenvanrossem/master
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 5 Aug 2016 14:44:32 +0000 (16:44 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 5 Aug 2016 14:44:32 +0000 (16:44 +0200)
keep mgmt interface + add priority option for flowrules


Trivial merge