Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 74a41ef403151c1a22e2b2509743453e93f873ab Merge: 342f7f3 ecdc9bc Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Jan 19 17:37:19 2016 +0100

Merge branch 'next'

74a41ef403151c1a22e2b2509743453e93f873ab CHANGELOG | 16 ++++++++++++++++ README.external | 2 +- net/batman-adv/main.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-)