[commits] [batctl] master: Merge branch 'next' (fe6eab5)

Repository : ssh://git@open-mesh.org/batctl

On branch : master

commit fe6eab5219f7fafaa679423873a0e9df15c2c37d Merge: f168d47 3387207 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Jan 6 16:45:32 2014 +0800

Merge branch 'next'

fe6eab5219f7fafaa679423873a0e9df15c2c37d functions.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- functions.h | 1 + main.c | 2 +- man/batctl.8 | 12 ++-- sys.c | 15 ++++- sys.h | 22 +++--- 6 files changed, 227 insertions(+), 35 deletions(-)