The branch, batman-adv/merge-bugfixonly has been deleted was 20dc9a5e1a84c7e07f428a6ab75000ff5ed46e6d
----------------------------------------------------------------------- 20dc9a5e1a84c7e07f428a6ab75000ff5ed46e6d batman-adv: Calculate correct size for merged packets -----------------------------------------------------------------------