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

On branch : master

commit b34590b05cd6f67def14b126b2ea6bc9692776b6 Merge: f95ce71 5bd2cac Author: Simon Wunderlich sw@simonwunderlich.de Date: Fri May 16 15:50:21 2014 +0200

Merge remote-tracking branch 'origin/next'

b34590b05cd6f67def14b126b2ea6bc9692776b6 CHANGELOG | 21 +++++++++++++++++++++ README.external | 2 +- main.h | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-)