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

On branch : master

commit c7cc2d49351da21f041578ae33a59cd938b18c8c Merge: 62ea441 ae9f569 Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Mar 13 12:18:29 2014 +0100

Merge remote-tracking branch 'origin/next'

c7cc2d49351da21f041578ae33a59cd938b18c8c CHANGELOG | 22 ++++++++++++++++++++++ README.external | 2 +- main.h | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-)