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

On branch : master

commit 2264f8ad0c64bcf74167e58d7e97378f2f18d824 Merge: 6ae4281 0c1c04b Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Jul 22 15:46:25 2014 +0200

Merge remote-tracking branch 'origin/next'

2264f8ad0c64bcf74167e58d7e97378f2f18d824 CHANGELOG | 12 ++++++++++++ README.external | 2 +- main.h | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-)