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

On branch : master

commit d5e4a47b88b5e900708763b9eb0101c54b0a707c Merge: ae72fda 49f0f59 Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Sat Apr 20 17:39:01 2013 +0200

Merge remote-tracking branch 'origin/next'

d5e4a47b88b5e900708763b9eb0101c54b0a707c CHANGELOG | 14 ++++++++++++++ README.external | 2 +- main.h | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-)