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

On branch : next

commit f9f727d6b2c068bebeeb0b502da6ac9bd530e07e Merge: bc91a4a 4dba221 Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Nov 13 16:32:58 2012 +0800

Merge branch 'maint' into next

f9f727d6b2c068bebeeb0b502da6ac9bd530e07e soft-interface.c | 12 ++++++------ translation-table.c | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-)