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

On branch : master

commit 18491357187f9fb8f0e56eb4a9a8af8f793dfd08 Merge: 2caa9e1 f05ad81 Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Sun Mar 3 18:32:50 2013 +0100

Merge remote-tracking branch 'origin/next'

Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

18491357187f9fb8f0e56eb4a9a8af8f793dfd08 CHANGELOG | 17 +++++++++++++++++ Makefile | 2 +- Makefile.kbuild | 2 +- README.external | 2 +- main.h | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-)