Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
---------------------------------------------------------------
commit 45226783f60204bd76c4b6064f449a3dca3e3ed7
Merge: ecfa261 8d29c2a
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Apr 21 14:13:26 2016 +0200
Merge branch 'next'
---------------------------------------------------------------
45226783f60204bd76c4b6064f449a3dca3e3ed7
CHANGELOG | 19 +++++++++++++++++++
net/batman-adv/main.h | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)